diff -Nru openoffice.org-2.3.1/debian/changelog openoffice.org-2.3.1/debian/changelog
--- openoffice.org-2.3.1/debian/changelog	2008-02-17 18:19:44.000000000 +0100
+++ openoffice.org-2.3.1/debian/changelog	2008-02-17 18:22:32.000000000 +0100
@@ -1,3 +1,10 @@
+openoffice.org (1:2.3.1-3ubuntu4) hardy; urgency=low
+
+  * Revert default fonts to Nimbus Roman No9 L/FreeSans/Nimbus Mono L.
+    Closes LP: #105906
+
+ -- Milan Bouchet-Valat <nalimilan@club.fr>  Sun, 17 Feb 2008 17:58:55 +0100
+
 openoffice.org (1:2.3.1-3ubuntu3) hardy; urgency=low
 
   * debian/control.in:
diff -Nru openoffice.org-2.3.1/ooo-build/patches/qatesttool/pdf-converter-as-default-printer.diff openoffice.org-2.3.1/ooo-build/patches/qatesttool/pdf-converter-as-default-printer.diff
--- openoffice.org-2.3.1/ooo-build/patches/qatesttool/pdf-converter-as-default-printer.diff	2008-02-17 18:19:44.000000000 +0100
+++ openoffice.org-2.3.1/ooo-build/patches/qatesttool/pdf-converter-as-default-printer.diff	2008-02-17 18:22:32.000000000 +0100
@@ -13,9 +13,9 @@
  ; Location: a user readable string that will be shown in the print dialog
  Location=
 @@ -96,3 +96,29 @@
- SubstFont_Thorndale=Times
- SubstFont_Timmons=Times
- SubstFont_Cumberland=Courier
+ SubstFont_Thorndale=Nimbus Roman No9 L
+ SubstFont_Timmons=Nimbus Roman No9 L
+ SubstFont_Cumberland=Nimbus Mono L
 +
 +[PDF converter]
 +Printer=SGENPRT/PDF converter
@@ -33,12 +33,12 @@
 +MarginAdjust=0,0,0,0
 +PPD_PageSize=Letter
 +PerformFontSubstitution=true
-+SubstFont_Arial=Helvetica
-+SubstFont_Times New Roman=Times
-+SubstFont_Cumberland=Courier
-+SubstFont_Timmons=Times
-+SubstFont_Helmet=Helvetica
-+SubstFont_Thorndale=Times
-+SubstFont_Albany=Helvetica
-+SubstFont_Courier New=Courier
++SubstFont_Arial=FreeSans
++SubstFont_Times New Roman=Nimbus Roman No9 L
++SubstFont_Cumberland=Nimbus Mono L
++SubstFont_Timmons=Nimbus Roman No9 L
++SubstFont_Helmet=FreeSans
++SubstFont_Thorndale=Nimbus Roman No9 L
++SubstFont_Albany=FreeSans
++SubstFont_Courier New=Nimbus Mono L
 +
diff -Nru /tmp/xJ73Xh6pZA/openoffice.org-2.3.1/ooo-build/patches/src680/writer-default-font.diff openoffice.org-2.3.1/ooo-build/patches/src680/writer-default-font.diff
--- openoffice.org-2.3.1/ooo-build/patches/src680/writer-default-font.diff	2008-02-17 18:19:44.000000000 +0100
+++ openoffice.org-2.3.1/ooo-build/patches/src680/writer-default-font.diff	2008-02-17 18:22:32.000000000 +0100
@@ -8,23 +8,23 @@
 + <node oor:name="DefaultFont">
       <prop oor:name="Standard">
 -       <value >Arial</value>
-+       <value>Times</value>
++       <value>Nimbus Roman No9 L</value>
       </prop>
       <prop oor:name="Heading">
 -       <value >Arial</value>
-+       <value>Helvetica</value>
++       <value>FreeSans</value>
       </prop>
       <prop oor:name="List">
 -       <value >Arial</value>
-+       <value>Times</value>
++       <value>Nimbus Roman No9 L</value>
       </prop>
       <prop oor:name="Caption">
 -       <value >Arial</value>
-+       <value>Times</value>
++       <value>Nimbus Roman No9 L</value>
       </prop>
       <prop oor:name="Index">
 -       <value >Arial</value>
-+       <value>Times</value>
++       <value>Nimbus Roman No9 L</value>
       </prop>
   </node>
  </oor:component-data>