diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index aa9d3798d..365948bac 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2011-12-17  Corinna Vinschen  <vinschen@redhat.com>
+
+	* wow64.cc (wow64_revert_to_original_stack): Fix comment.
+	* wow64.h (wow64_respawn_process): Declare noreturn.
+
 2011-12-17  Christopher Faylor  <me.cygwin2011@cgf.cx>
 
 	* exceptions.cc (set_signal_mask): Remove useless debugging output.
diff --git a/winsup/cygwin/wow64.cc b/winsup/cygwin/wow64.cc
index 20ea2e467..53defec4f 100644
--- a/winsup/cygwin/wow64.cc
+++ b/winsup/cygwin/wow64.cc
@@ -119,9 +119,9 @@ wow64_revert_to_original_stack (PVOID &allocationbase)
   if (mbi.State != MEM_RESERVE || mbi.RegionSize < 256 * 1024)
     return NULL;
 
-  /* Next we expect a guard page.  We fetch the size of the guard area since
-     to see how the OS is handling that.  Apparently the guard area on 64 bit
-     systems spans 2 pages. */
+  /* Next we expect a guard page.  We fetch the size of the guard area to
+     see how big it is.  Apparently the guard area on 64 bit systems spans
+     2 pages. */
   PVOID addr = PTR_ADD (mbi.BaseAddress, mbi.RegionSize);
   VirtualQuery (addr, &mbi, sizeof mbi);
   if (mbi.AllocationBase != allocationbase
diff --git a/winsup/cygwin/wow64.h b/winsup/cygwin/wow64.h
index bd0564f1f..189440950 100644
--- a/winsup/cygwin/wow64.h
+++ b/winsup/cygwin/wow64.h
@@ -12,4 +12,4 @@ extern bool NO_COPY wow64_has_64bit_parent;
 
 extern bool wow64_test_for_64bit_parent ();
 extern PVOID wow64_revert_to_original_stack (PVOID &allocationbase);
-extern void wow64_respawn_process ();
+extern void wow64_respawn_process () __attribute__ ((noreturn));