diff --git a/tmcd/common/config/rc.misc b/tmcd/common/config/rc.misc
index 3cc062b5c173bca67b2c96f8e5180fdec8c2e6f7..3d0c5e8879fde8189986bfd7542107eb1dd28f5e 100755
--- a/tmcd/common/config/rc.misc
+++ b/tmcd/common/config/rc.misc
@@ -168,7 +168,7 @@ sub docreator()
     #
     # There should be just one string. Ignore anything else.
     #
-    if ($tmccresults[0] =~ /^CREATOR=([-\w]*)$/) {
+    if ($tmccresults[0] =~ /^CREATOR=([-\w]*)/) {
 	$creator = $1;
     }
     else {
diff --git a/tmcd/common/libsetup.pm b/tmcd/common/libsetup.pm
index 214cd8d248a1fd83e7d92ad7c4a04916151d6197..cdb6b9c11040cef498362a5a8b364deaca65d5a2 100644
--- a/tmcd/common/libsetup.pm
+++ b/tmcd/common/libsetup.pm
@@ -44,7 +44,7 @@ use libtmcc;
 #
 # BE SURE TO BUMP THIS AS INCOMPATIBILE CHANGES TO TMCD ARE MADE!
 #
-sub TMCD_VERSION()	{ 20; };
+sub TMCD_VERSION()	{ 21; };
 libtmcc::configtmcc("version", TMCD_VERSION());
 
 # Control tmcc timeout.
diff --git a/tmcd/decls.h b/tmcd/decls.h
index 0ff3f3b0d47e9006642a067f5aaef77ee1cfc153..662596e39756f6190c9d4b93843afb63ed540a00 100644
--- a/tmcd/decls.h
+++ b/tmcd/decls.h
@@ -25,4 +25,4 @@
  * NB: See ron/libsetup.pm. That is version 4! I'll merge that in. 
  */
 #define DEFAULT_VERSION		2
-#define CURRENT_VERSION		20
+#define CURRENT_VERSION		21
diff --git a/tmcd/tmcd.c b/tmcd/tmcd.c
index 7f03ec717f1686f2964e1559dc023fa0ce74229f..f790feb24749fd3a38d9465c59c884622b26024b 100644
--- a/tmcd/tmcd.c
+++ b/tmcd/tmcd.c
@@ -3479,7 +3479,13 @@ COMMAND_PROTOTYPE(docreator)
 {
 	char		buf[MYBUFSIZE];
 
-	OUTPUT(buf, sizeof(buf), "CREATOR=%s\n", reqp->creator);
+	/* There was a $ anchored CREATOR= pattern in common/config/rc.misc . */
+	if (vers<=20)
+		OUTPUT(buf, sizeof(buf), "CREATOR=%s\n", reqp->creator);
+	else
+		OUTPUT(buf, sizeof(buf), "CREATOR=%s SWAPPER=%s\n", 
+		       reqp->creator, reqp->swapper);
+
 	client_writeback(sock, buf, strlen(buf), tcp);
 	if (verbose)
 		info("CREATOR: %s", buf);