diff --git a/ChangeLog b/ChangeLog
index 52724d13..86558470 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,11 @@
 2011-11-13  Paul Smith  <psmith@gnu.org>
 
+	* main.c (clean_jobserver): Don't write the free token to the pipe.
+	Change suggested by Tim Newsome <tnewsome@aristanetworks.com>
+
 	* acinclude.m4 (AC_STRUCT_ST_MTIM_NSEC): Add support for Darwin.
-	Patch provided by Troy Runkel <Troy.Runkel@mathworks.com>
 	* filedef.h (FILE_TIMESTAMP_STAT_MODTIME): Ditto.
+	Patch provided by Troy Runkel <Troy.Runkel@mathworks.com>
 
 2011-09-18  Paul Smith  <psmith@gnu.org>
 
diff --git a/main.c b/main.c
index 75eb4941..d260859a 100644
--- a/main.c
+++ b/main.c
@@ -3116,7 +3116,8 @@ clean_jobserver (int status)
                "INTERNAL: Exiting with %u jobserver tokens (should be 0)!",
                jobserver_tokens);
       else
-        while (jobserver_tokens--)
+        /* Don't write back the "free" token */
+        while (--jobserver_tokens)
           {
             int r;