diff --git a/src/paks/linux-pae/install.sh b/src/paks/linux-pae/install.sh
index 59e17bfec..ab740512f 100644
--- a/src/paks/linux-pae/install.sh
+++ b/src/paks/linux-pae/install.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2013 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -54,7 +54,7 @@ fi
 #
 # backup grub.conf
 #
-cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae.conf
+cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-pae_install.conf
 #
 # Add new Entry to grub.conf
 #
diff --git a/src/paks/linux-pae/uninstall.sh b/src/paks/linux-pae/uninstall.sh
index 959fdb1a7..69c7e565f 100644
--- a/src/paks/linux-pae/uninstall.sh
+++ b/src/paks/linux-pae/uninstall.sh
@@ -17,10 +17,15 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2010 IPFire-Team <info@ipfire.org>.                        #
+# Copyright (C) 2007-2013 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
 remove_files
-#mv -f /boot/grub/grub-backup-2.6.32.*-pae.conf /boot/grub/grub.conf
+rm -rf /boot/ipfirerd-*-pae.img
+rm -rf /lib/modules/*-ipfire-pae
+cp /boot/grub/grub.conf /boot/grub/grub-backup-pae_uninstall.conf
+sed -i "/title IPFire (PAE-Kernel)/,+3d" /boot/grub/grub.conf
+grub-set-default 1
+sync && sync
diff --git a/src/paks/linux-pae/update.sh b/src/paks/linux-pae/update.sh
index 2878dfb4f..1ad1831a7 100644
--- a/src/paks/linux-pae/update.sh
+++ b/src/paks/linux-pae/update.sh
@@ -17,11 +17,10 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2011 IPFire-Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2013 IPFire-Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 . /opt/pakfire/lib/functions.sh
-#Don't remove old pae kernel at update
-#./uninstall.sh
+./uninstall.sh
 ./install.sh