diff --git a/kernel-1.spec b/kernel-1.spec
index feb147d..0afe0f2 100644
--- a/kernel-1.spec
+++ b/kernel-1.spec
@@ -28,7 +28,7 @@
 %define rpmrel		%mkrel 0.%{kpatch}.%{mibrel}
 %endif
 %else
-%define rpmrel		1
+%define rpmrel		2
 %endif
 
 # fakerel and fakever never change, they are used to fool
@@ -402,7 +402,7 @@ processor mode, use the "nosmp" boot parameter.
 
 ### Global Requires/Provides
 
-%define requires1	bootloader-utils >= 1.15-8
+%define requires1	grub2
 %define requires2	dracut >= 017-16
 %define requires3	kmod >= 7-6
 %define requires4	sysfsutils >=  2.1.0-12
@@ -1484,27 +1484,33 @@ EOF
 
 ### Create kernel Post script
 cat > $kernel_files-post <<EOF
-%ifarch %{arm}
-/sbin/installkernel -i -N %{kversion}-$kernel_flavour-%{buildrpmrel}
-%else
-/sbin/installkernel %{kversion}-$kernel_flavour-%{buildrpmrel}
+KVER=%{kversion}-$kernel_flavour-%{buildrpmrel}
+INITRD=/boot/initrd-\${KVER}.img
+
+if [ ! -e \${INITRD} ]; then
+	/sbin/dracut \${INITRD} \${KVER}
+else
+	printf "WARNING: Initrd image \${INITRD} already exists and will not be replaced.\n"
+fi
+/usr/sbin/update-grub2
+
 pushd /boot > /dev/null
 if [ -L vmlinuz-$kernel_flavour ]; then
 	rm -f vmlinuz-$kernel_flavour
 fi
-ln -sf vmlinuz-%{kversion}-$kernel_flavour-%{buildrpmrel} vmlinuz-$kernel_flavour
+#ln -sf vmlinuz-\${KVER} vmlinuz-$kernel_flavour
 if [ -L initrd-$kernel_flavour.img ]; then
 	rm -f initrd-$kernel_flavour.img
 fi
-ln -sf initrd-%{kversion}-$kernel_flavour-%{buildrpmrel}.img initrd-$kernel_flavour.img
+#ln -sf initrd-\${KVER}.img initrd-$kernel_flavour.img
 popd > /dev/null
-%endif
+
 %if %build_devel
 # create kernel-devel symlinks if matching -devel- rpm is installed
-if [ -d /usr/src/linux-%{kversion}-$kernel_flavour-%{buildrpmrel} ]; then
-	rm -f /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/{build,source}
-	ln -sf /usr/src/linux-%{kversion}-$kernel_flavour-%{buildrpmrel} /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/build
-	ln -sf /usr/src/linux-%{kversion}-$kernel_flavour-%{buildrpmrel} /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/source
+if [ -d /usr/src/linux-\${KVER} ]; then
+	rm -f /lib/modules/\${KVER}/{build,source}
+	ln -sf /usr/src/linux-\${KVER} /lib/modules/\${KVER}/build
+	ln -sf /usr/src/linux-\${KVER} /lib/modules/\${KVER}/source
 fi
 %endif
 EOF
@@ -1518,25 +1524,28 @@ EOF
 
 ### Create kernel Preun script on the fly
 cat > $kernel_files-preun <<EOF
-/sbin/installkernel -R %{kversion}-$kernel_flavour-%{buildrpmrel}
+KVER=%{kversion}-$kernel_flavour-%{buildrpmrel}
 pushd /boot > /dev/null
 if [ -L vmlinuz-$kernel_flavour ]; then
-	if [ "$(readlink vmlinuz-$kernel_flavour)" = "vmlinuz-%{kversion}-$kernel_flavour-%{buildrpmrel}" ]; then
+	if [ "$(readlink vmlinuz-$kernel_flavour)" = "vmlinuz-\${KVER}" ]; then
 		rm -f vmlinuz-$kernel_flavour
 	fi
 fi
 if [ -L initrd-$kernel_flavour.img ]; then
-	if [ "$(readlink initrd-$kernel_flavour.img)" = "initrd-%{kversion}-$kernel_flavour-%{buildrpmrel}.img" ]; then
+	if [ "$(readlink initrd-$kernel_flavour.img)" = "initrd-\${KVER}.img" ]; then
 		rm -f initrd-$kernel_flavour.img
 	fi
 fi
+
+/usr/sbin/update-grub2
+
 popd > /dev/null
 %if %build_devel
-if [ -L /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/build ]; then
-	rm -f /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/build
+if [ -L /lib/modules/\${KVER}/build ]; then
+	rm -f /lib/modules/\${KVER}/build
 fi
-if [ -L /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/source ]; then
-	rm -f /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel}/source
+if [ -L /lib/modules/\${KVER}/source ]; then
+	rm -f /lib/modules/\${KVER}/source
 fi
 %endif
 exit 0
@@ -1545,13 +1554,16 @@ EOF
 
 ### Create kernel Postun script on the fly
 cat > $kernel_files-postun <<EOF
-/sbin/kernel_remove_initrd %{kversion}-$kernel_flavour-%{buildrpmrel}
-rm -rf /lib/modules/%{kversion}-$kernel_flavour-%{buildrpmrel} >/dev/null
+KVER=%{kversion}-$kernel_flavour-%{buildrpmrel}
+KVER_DEVEL=%{kversion}-$devel_flavour-%{buildrpmrel}
+rm -f /boot/initrd-\${KVER}.img
+rm -f /boot/initrd-\${KVER}_old.img
+rm -rf /lib/modules/\${KVER} >/dev/null
 if [ -d /var/lib/dkms ]; then
-    rm -f /var/lib/dkms/*/kernel-%{kversion}-$devel_flavour-%{buildrpmrel}-%{_target_cpu} >/dev/null
-    rm -rf /var/lib/dkms/*/*/%{kversion}-$devel_flavour-%{buildrpmrel} >/dev/null
-    rm -f /var/lib/dkms-binary/*/kernel-%{kversion}-$devel_flavour-%{buildrpmrel}-%{_target_cpu} >/dev/null
-    rm -rf /var/lib/dkms-binary/*/*/%{kversion}-$devel_flavour-%{buildrpmrel} >/dev/null
+    rm -f /var/lib/dkms/*/kernel-\${KVER_DEVEL}-%{_target_cpu} >/dev/null
+    rm -rf /var/lib/dkms/*/*/\${KVER_DEVEL} >/dev/null
+    rm -f /var/lib/dkms-binary/*/kernel-\${KVER_DEVEL}-%{_target_cpu} >/dev/null
+    rm -rf /var/lib/dkms-binary/*/*/\${KVER_DEVEL} >/dev/null
 fi
 EOF
 }