diff -u firefox-2.0.0.4+2/debian/changelog firefox-2.0.0.4+2/debian/changelog
--- firefox-2.0.0.4+2/debian/changelog
+++ firefox-2.0.0.4+2/debian/changelog
@@ -1,3 +1,12 @@
+firefox (2.0.0.4+2-0ubuntu4) gutsy; urgency=low
+
+  * debian/firefox.install: Resurrect /etc/firefox/profile/. Without it,
+    Firefox creates an empty profile as a file instead of a directory, which
+    both makes it break, and also would not have our Ubuntu specific
+    bookmarks, settings, etc. (LP: #123917)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 18 Jul 2007 20:11:59 +0200
+
 firefox (2.0.0.4+2-0ubuntu3) gutsy; urgency=low
 
   * drop more patches:
diff -u firefox-2.0.0.4+2/debian/firefox.install firefox-2.0.0.4+2/debian/firefox.install
--- firefox-2.0.0.4+2/debian/firefox.install
+++ firefox-2.0.0.4+2/debian/firefox.install
@@ -6,6 +6,7 @@
 
 debian/tmp/usr/lib/firefox/defaults/autoconfig usr/share/firefox/defaults
 debian/tmp/usr/lib/firefox/defaults/pref usr/share/firefox/defaults
+debian/tmp/usr/lib/firefox/defaults/profile etc/firefox/
 debian/tmp/usr/lib/firefox/greprefs usr/share/firefox
 debian/tmp/usr/lib/firefox/res usr/share/firefox
 debian/tmp/usr/lib/firefox/searchplugins usr/share/firefox