diff --git a/THANKS b/THANKS
index 72cc149d0..efb7c4ed3 100644
--- a/THANKS
+++ b/THANKS
@@ -1,4 +1,4 @@
-$Id: THANKS,v 1.12 2011/10/02 18:25:17 pseudo Exp $:
+$Id: THANKS,v 1.13 2011/10/25 16:45:08 thommey Exp $:
 
 Eggdrop Developers and Contributors
 Last revised: June 16, 2010
@@ -203,6 +203,7 @@ DocSavag       Jerry Sutton                    jerrystn@ccse.net
 dollar
 Domino
                Donovan Long
+Dopsy                                          dopsy@orastie.org
 dorgan
 dork
 dracwolf
diff --git a/doc/Changes1.6 b/doc/Changes1.6
index c92f629fe..c0fec0e91 100644
--- a/doc/Changes1.6
+++ b/doc/Changes1.6
@@ -1,4 +1,4 @@
-$Id: Changes1.6,v 1.116 2011/10/02 20:51:31 pseudo Exp $
+$Id: Changes1.6,v 1.117 2011/10/25 16:45:08 thommey Exp $
 
 Eggdrop Changes (since version 1.6.0)
 
@@ -6,6 +6,12 @@ Eggdrop Changes (since version 1.6.0)
 
 1.6.21 (CVS):
 
+  - Added missing read trace flag to the nick-len variable trace after
+    being unset to make the trace be removed properly on unload.
+    Found by: Dopsy / Patch by: pseudo
+
+  # RC1 released on October 3rd, 2011.
+
   - Updated instructions for compilation under Cygwin. Updated space
     requirements a bit.
     Patch by: pseudo
diff --git a/src/mod/server.mod/server.c b/src/mod/server.mod/server.c
index 4b79450fa..b85bea710 100644
--- a/src/mod/server.mod/server.c
+++ b/src/mod/server.mod/server.c
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.139 2011/02/13 14:19:34 simple Exp $
+ * $Id: server.c,v 1.140 2011/10/25 16:45:08 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1324,8 +1324,8 @@ static char *traced_nicklen(ClientData cdata, Tcl_Interp *irp,
     egg_snprintf(s, sizeof s, "%d", nick_len);
     Tcl_SetVar2(interp, name1, name2, s, TCL_GLOBAL_ONLY);
     if (flags & TCL_TRACE_UNSETS)
-      Tcl_TraceVar(irp, name1, TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
-                   traced_nicklen, cdata);
+      Tcl_TraceVar(irp, name1, TCL_TRACE_READS | TCL_TRACE_WRITES |
+                   TCL_TRACE_UNSETS, traced_nicklen, cdata);
   } else {
     EGG_CONST char *cval = Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
     long lval = 0;
diff --git a/src/patch.h b/src/patch.h
index 9203f12d8..1a4a33148 100644
--- a/src/patch.h
+++ b/src/patch.h
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.1269 2011/10/02 20:11:06 pseudo Exp $
+ * $Id: patch.h,v 1.1270 2011/10/25 16:45:08 thommey Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@ patch("CVS");                   /* CVS version */
  *
  *
  */
-patch("1317586214");            /* current unixtime */
+patch("1319561053");            /* current unixtime */
 /*
  *
  *
  */
-patch("baddrshare");
+patch("nicklentrace");
 /*
  *
  *