--- lily/main.cc.orig	2009-01-19 01:04:57.000000000 +0100
+++ lily/main.cc	2009-02-02 10:56:16.000000000 +0100
@@ -220,9 +220,8 @@
 copyright ()
 {
   /* Do not update the copyright years here, run grand-replace.sh.  */
-  printf (_f ("Copyright (c) %s by\n%s  and others.", "1996--2009",
+  puts (_f ("Copyright (c) %s by\n%s  and others.", "1996--2009",
 	      AUTHORS).c_str ());
-  printf ("\n");
 }
 
 static void
@@ -247,23 +246,23 @@
 	   "Print usage message.")
 {
   /* No version number or newline here.  It confuses help2man.  */
-  printf (_f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ());
+  printf ("%s", _f ("Usage: %s [OPTION]... FILE...", PROGRAM_NAME).c_str ());
   printf ("\n\n");
-  printf (_ ("Typeset music and/or produce MIDI from FILE.").c_str ());
+  printf ("%s", _ ("Typeset music and/or produce MIDI from FILE.").c_str ());
   printf ("\n\n");
-  printf (_ ("LilyPond produces beautiful music notation.").c_str ());
+  printf ("%s", _ ("LilyPond produces beautiful music notation.").c_str ());
   printf ("\n");
-  printf (_f ("For more information, see %s", PROGRAM_URL).c_str ());
+  printf ("%s", _f ("For more information, see %s", PROGRAM_URL).c_str ());
   printf ("\n\n");
-  printf (_ ("Options:").c_str ());
+  printf ("%s",_ ("Options:").c_str ());
   printf ("\n");
-  printf (Long_option_init::table_string (options_static).c_str ());
+  printf ("%s", Long_option_init::table_string (options_static).c_str ());
   printf ("\n");
   /* Translators, please translate this string as
          "Report bugs in English via %s",
      or if there is a LilyPond users list or forum in your language
          "Report bugs in English via %s or in YOUR_LANG via URI"  */
-  printf (_f ("Report bugs via %s",
+  printf ("%s", _f ("Report bugs via %s",
 	      "http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs"
 	      ).c_str ());
   printf ("\n");
@@ -278,7 +277,7 @@
   printf ("\n");
   copyright ();
   printf ("\n");
-  printf (_ (WARRANTY).c_str ());
+  printf ("%s", _ (WARRANTY).c_str ());
 }
 
 static void