diff --git a/keyserver/ChangeLog b/keyserver/ChangeLog
index 07ecd1769..3dece69d4 100644
--- a/keyserver/ChangeLog
+++ b/keyserver/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-23  David Shaw  <dshaw@jabberwocky.com>
+
+	* gpgkeys_ldap.c (build_attrs): Properly terminate user ID strings
+	that got shrunk due to encoding.
+
 2004-08-22  David Shaw  <dshaw@jabberwocky.com>
 
 	* gpgkeys_ldap.c (find_basekeyspacedn): Use LDAP_SCOPE_BASE along
diff --git a/keyserver/gpgkeys_ldap.c b/keyserver/gpgkeys_ldap.c
index 41bf58692..91dca0614 100644
--- a/keyserver/gpgkeys_ldap.c
+++ b/keyserver/gpgkeys_ldap.c
@@ -534,6 +534,8 @@ build_attrs(LDAPMod ***modlist,char *line)
 	else
 	  userid[i++]=*tok++;
 
+      userid[i]='\0';
+
       /* We don't care about the other info provided in the uid: line
 	 since the LDAP schema doesn't need it. */