diff --git a/THANKS b/THANKS
index a01dcfb17..c517cf724 100644
--- a/THANKS
+++ b/THANKS
@@ -77,6 +77,7 @@ For fixes or providing information which led to a fix:
              Fu-gangqiang
           Aidan Gauland
           Peter Gavin
+         Andrew Gaylard
            Nils Gey
            Eric Gillespie, Jr
          Didier Godefroy
diff --git a/libguile/threads.c b/libguile/threads.c
index c5947915e..8cbe1e22f 100644
--- a/libguile/threads.c
+++ b/libguile/threads.c
@@ -327,7 +327,7 @@ remqueue (SCM q, SCM c)
       if (scm_is_eq (p, c))
 	{
 	  if (scm_is_eq (c, SCM_CAR (q)))
-	    SCM_SETCAR (q, SCM_CDR (c));
+            SCM_SETCAR (q, scm_is_eq (prev, q) ? SCM_EOL : prev);
 	  SCM_SETCDR (prev, SCM_CDR (c));
 
 	  /* GC-robust */