diff --git a/rpm_spec/qubes-utils.spec.in b/rpm_spec/qubes-utils.spec.in
index 324ad16..0205317 100644
--- a/rpm_spec/qubes-utils.spec.in
+++ b/rpm_spec/qubes-utils.spec.in
@@ -118,7 +118,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-/lib/udev/rules.d/99-qubes-*.rules
+/lib/udev/rules.d/*-qubes-*.rules
 /usr/lib/qubes/udev-*
 %{_sbindir}/meminfo-writer
 %{_unitdir}/qubes-meminfo-writer.service
diff --git a/udev/Makefile b/udev/Makefile
index 6eff34a..ec3c6e3 100644
--- a/udev/Makefile
+++ b/udev/Makefile
@@ -5,6 +5,7 @@ install:
 	cp udev-qubes-block.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-block.rules
 	cp udev-qubes-usb.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-usb.rules
 	cp udev-qubes-misc.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/99-qubes-misc.rules
+	cp udev-qubes-dmroot.rules $(DESTDIR)$(SYSLIBDIR)/udev/rules.d/90-qubes-dmroot.rules
 
 	mkdir -p $(DESTDIR)$(SCRIPTSDIR)
 	cp udev-block-add-change $(DESTDIR)$(SCRIPTSDIR)
diff --git a/udev/udev-qubes-dmroot.rules b/udev/udev-qubes-dmroot.rules
new file mode 100644
index 0000000..304ebee
--- /dev/null
+++ b/udev/udev-qubes-dmroot.rules
@@ -0,0 +1,5 @@
+# Create /dev/mapper/dmroot symlink on TemplateVM/StandaloneVM to make
+# grub-mkconfig happy.
+# On TemplateBasedVM, it is really a device mapper device.
+
+SUBSYSTEM=="block", ENV{ID_PART_ENTRY_NAME}=="Root\x20filesystem", ATTR{ro}=="0", SYMLINK+="mapper/dmroot"