diff --git a/config/rootfiles/core/31/update.sh b/config/rootfiles/core/31/update.sh
index 1780a1325..87cc51923 100644
--- a/config/rootfiles/core/31/update.sh
+++ b/config/rootfiles/core/31/update.sh
@@ -30,6 +30,9 @@ MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
 # Nur den letzten Parameter verwenden
 echo $MOUNT > /dev/null
 MOUNT=$_
+if [ ! $MOUNT == "rw" ]; then
+	MOUNT="ro"
+fi
 #
 # check if we the backup file already exist
 if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then
diff --git a/lfs/xen-image b/lfs/xen-image
index bd21aac0b..bb7449272 100644
--- a/lfs/xen-image
+++ b/lfs/xen-image
@@ -81,12 +81,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	#Create grub menuentry for pygrub
 	mkdir $(MNThdd)/boot/grub
-	echo "title IPFire (XEN-Kernel)"           > $(MNThdd)/boot/grub/grub.conf
-	echo "  root(hd0,0)"                      >> $(MNThdd)/boot/grub/grub.conf
-	echo "  kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 ro" \
+	echo "default 1"                           > $(MNThdd)/boot/grub/grub.conf
+	echo "title IPFire (XEN-Kernel)"          >> $(MNThdd)/boot/grub/grub.conf
+	echo "  kernel /vmlinuz-$(KVER)-ipfire-xen root=/dev/xvda1 rootdelay=10 panic=10 console=xvc0 ro" \
 						  >> $(MNThdd)/boot/grub/grub.conf
 	echo "  initrd /ipfirerd-$(KVER)-xen.img" >> $(MNThdd)/boot/grub/grub.conf
-	echo "  savedefault 1"                    >> $(MNThdd)/boot/grub/grub.conf
 	ln -s grub.conf $(MNThdd)/boot/grub/menu.lst
 
 	#Copy the meta-info of linux-xen package
diff --git a/src/paks/linux-xen/install.sh b/src/paks/linux-xen/install.sh
index 38daf4027..b2c8f383e 100644
--- a/src/paks/linux-xen/install.sh
+++ b/src/paks/linux-xen/install.sh
@@ -43,10 +43,21 @@ cp /boot/grub/grub.conf /boot/grub/grub-backup-$KVER-xen.conf
 #
 echo "" >> /boot/grub/grub.conf
 echo "title IPFire (XEN-Kernel)" >> /boot/grub/grub.conf
-echo "  root (hd0,0)" >> /boot/grub/grub.conf
-echo "  kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 $MOUNT" >> /boot/grub/grub.conf
+echo "  kernel /vmlinuz-$KVER-ipfire-xen root=$ROOT rootdelay=10 panic=10 console=xvc0 $MOUNT" >> /boot/grub/grub.conf
 echo "  initrd /ipfirerd-$KVER-xen.img" >> /boot/grub/grub.conf
-echo "  savedefault $ENTRY" >> /boot/grub/grub.conf
+#
+# Test if we running already on xen
+#
+uname -r ¦ grep "ipfire-xen";
+if [ ${?} = 0 ]; then
+	#Xen Kernel is active
+	#Set grub default entry to this kernel
+	sed -i -e "s¦^default saved¦default $ENTRY¦g" /boot/grub/grub.conf
+else
+	#Normal Kernel
+	#pygrub crash with "default saved"
+	sed -i -e "s¦^default saved¦#default saved¦g" /boot/grub/grub.conf
+fi
 #
 # Made initramdisk
 #