diff -Nru ipxe-1.0.0+git-2.149b50/debian/changelog ipxe-1.0.0+git-2.149b50/debian/changelog
--- ipxe-1.0.0+git-2.149b50/debian/changelog	2011-08-19 17:43:06.000000000 -0500
+++ ipxe-1.0.0+git-2.149b50/debian/changelog	2011-09-14 11:45:33.000000000 -0500
@@ -1,3 +1,11 @@
+ipxe (1.0.0+git-2.149b50-1ubuntu2) oneiric; urgency=low
+
+  * Temporarily revert the changing of the names of /usr/share/qemu/*.rom
+    links to *.bin.  Qemu 0.15 will need .rom, but oneiric's qemu version
+    still needs *.bin. (LP: #850154)
+
+ -- Serge Hallyn <serge.hallyn@ubuntu.com>  Wed, 14 Sep 2011 11:34:53 -0500
+
 ipxe (1.0.0+git-2.149b50-1ubuntu1) oneiric; urgency=low
 
   * Link Roms into /usr/share/qemu for consumption by
diff -Nru ipxe-1.0.0+git-2.149b50/debian/ipxe.links ipxe-1.0.0+git-2.149b50/debian/ipxe.links
--- ipxe-1.0.0+git-2.149b50/debian/ipxe.links	2011-08-19 17:37:56.000000000 -0500
+++ ipxe-1.0.0+git-2.149b50/debian/ipxe.links	2011-09-14 11:34:37.000000000 -0500
@@ -1,5 +1,5 @@
-usr/lib/ipxe/virtio-net.rom usr/share/qemu/pxe-virtio.rom
-usr/lib/ipxe/rtl8139.rom usr/share/qemu/pxe-rtl8139.rom
-usr/lib/ipxe/pcnet32.rom usr/share/qemu/pxe-pcnet32.rom
-usr/lib/ipxe/ne2k_isa.rom usr/share/qemu/pxe-ne2k_isa.rom
-usr/lib/ipxe/e1000_82540.rom usr/share/qemu/pxe-e1000.rom
+usr/lib/ipxe/virtio-net.rom usr/share/qemu/pxe-virtio.bin
+usr/lib/ipxe/rtl8139.rom usr/share/qemu/pxe-rtl8139.bin
+usr/lib/ipxe/pcnet32.rom usr/share/qemu/pxe-pcnet32.bin
+usr/lib/ipxe/ne2k_isa.rom usr/share/qemu/pxe-ne2k_isa.bin
+usr/lib/ipxe/e1000_82540.rom usr/share/qemu/pxe-e1000.bin