diff --git a/fixincludes/ChangeLog b/fixincludes/ChangeLog
index 37a378fdb81..690fd4f7307 100644
--- a/fixincludes/ChangeLog
+++ b/fixincludes/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-24  Tristan Gingold  <gingold@adacore.com>
+
+	* fixincl.c (fix_with_system): Add missing specifier.
+	* configure.ac: Default to twoprocess on vms.
+	* configure: Regenerate.
+
 2012-03-23  David Edelsohn  <dje.gcc@gmail.com>
 
 	* inclhack.def (aix_malloc): New.
diff --git a/fixincludes/configure b/fixincludes/configure
index 4a28cd1f3fe..ea889b80f0f 100755
--- a/fixincludes/configure
+++ b/fixincludes/configure
@@ -4715,7 +4715,8 @@ else
 	i?86-*-msdosdjgpp* | \
 	i?86-*-mingw32* | \
 	x86_64-*-mingw32* | \
-	*-*-beos* )
+	*-*-beos* | \
+        *-*-*vms*)
 		TARGET=twoprocess
 		;;
 
diff --git a/fixincludes/configure.ac b/fixincludes/configure.ac
index e7de7918267..f1fb2ff4e56 100644
--- a/fixincludes/configure.ac
+++ b/fixincludes/configure.ac
@@ -53,7 +53,8 @@ fi],
 	i?86-*-msdosdjgpp* | \
 	i?86-*-mingw32* | \
 	x86_64-*-mingw32* | \
-	*-*-beos* )
+	*-*-beos* | \
+        *-*-*vms*)
 		TARGET=twoprocess
 		;;
 
diff --git a/fixincludes/fixincl.c b/fixincludes/fixincl.c
index 9f399abdd83..1133534202b 100644
--- a/fixincludes/fixincl.c
+++ b/fixincludes/fixincl.c
@@ -829,7 +829,7 @@ fix_with_system (tFixDesc* p_fixd,
       /*
        *  Now add the fix number and file names that may be needed
        */
-      sprintf (pz_scan, " %ld '%s' '%s'",  (long) (p_fixd - fixDescList),
+      sprintf (pz_scan, " %ld '%s' '%s' '%s'", (long) (p_fixd - fixDescList),
 	       pz_fix_file, pz_file_source, pz_temp_file);
     }
   else /* NOT an "internal" fix: */