diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 48a13142b..be9863eb3 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,7 @@
+2013-06-19  Christopher Faylor  <me.cygwin2013@cgf.cx>
+
+	* winf.h (av::unshift): Make __reg2.
+
 2013-06-19  Christopher Faylor  <me.cygwin2013@cgf.cx>
 
 	* spawn.cc (child_info_spawn::worker): Eliminate call to newargv.set()
diff --git a/winsup/cygwin/winf.h b/winsup/cygwin/winf.h
index b99a4f3e7..3dd63b5e0 100644
--- a/winsup/cygwin/winf.h
+++ b/winsup/cygwin/winf.h
@@ -43,7 +43,7 @@ class av
 	cfree (argv);
       }
   }
-  int unshift (const char *what, int conv = 0);
+  int unshift (const char *what, int conv = 0) __reg2;
   operator char **() {return argv;}
   void all_calloced () {calloced = argc;}
   void replace0_maybe (const char *arg0)
@@ -61,7 +61,8 @@ class av
       argv[i] = cstrdup1 (argv[i]);
     calloced = argc;
   }
-  int setup (const char *, path_conv&, const char *, int, const char *const *, bool) __reg3;
+  int setup (const char *, path_conv&, const char *, int, const char *const *,
+	     bool) __reg3;
 };
 
 class linebuf