diff --git a/build_pxe_boot.sh b/build_pxe_boot.sh
index a93e3f04cb..2c4cc0e9c1 100755
--- a/build_pxe_boot.sh
+++ b/build_pxe_boot.sh
@@ -63,19 +63,19 @@ cat >>$DEFAULT <<EOF
 LABEL devstack
     MENU LABEL ^devstack
     MENU DEFAULT
-    KERNEL ubuntu/vmlinuz-$KVER-generic
+    KERNEL ubuntu/vmlinuz-$KVER
     APPEND initrd=ubuntu/stack-initrd.gz ramdisk_size=2109600 root=/dev/ram0
 EOF
 
 # Get Ubuntu
 if [ -d $OPWD/pxe ]; then
-    cp -p $OPWD/pxe/natty-min-initrd.gz $DEST_DIR/ubuntu
+    cp -p $OPWD/pxe/natty-base-initrd.gz $DEST_DIR/ubuntu
 fi
 cat >>$DEFAULT <<EOF
 
 LABEL ubuntu
     MENU LABEL ^Ubuntu Natty
-    KERNEL ubuntu/vmlinuz-$KVER-generic
+    KERNEL ubuntu/vmlinuz-$KVER
     APPEND initrd=ubuntu/natty-base-initrd.gz ramdisk_size=419600 root=/dev/ram0
 EOF