diff --git a/g10/ChangeLog b/g10/ChangeLog
index 28abd44c8..619949da0 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2007-10-27  David Shaw  <dshaw@jabberwocky.com>
+
+	* keyserver.c (keyserver_spawn): Cosmetic, but looks cleaner.
+
 2007-10-23  Werner Koch  <wk@g10code.com>
 
 	Switched entire package to GPLv3+.
diff --git a/g10/keyserver.c b/g10/keyserver.c
index 7915aff51..227af1afb 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -1418,7 +1418,7 @@ keyserver_spawn(enum ks_action action,STRLIST list,KEYDB_SEARCH_DESC *desc,
       plen=strlen(ptr);
       while(plen>0 && ascii_isspace(ptr[plen-1]))
 	plen--;
-      plen[ptr]='\0';
+      ptr[plen]='\0';
 
       if(*ptr=='\0')
 	break;