diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7b9d2443e..4b09f1362 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,8 @@
+2003-01-14  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (add_group): Fixed group parsing to allow more than one
+	delimiter in a row and also allow tab as delimiter.
+
 2003-01-12  David Shaw  <dshaw@jabberwocky.com>
 
 	* tdbio.c (tdbio_set_dbname): Fix assertion failure with
diff --git a/g10/g10.c b/g10/g10.c
index 0452956dc..d845d84f1 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -859,8 +859,11 @@ static void add_group(char *string)
     }
 
   /* Break apart the values */
-  while((value=strsep(&string," ")) && *value!='\0')
-    add_to_strlist2(&values,value,utf8_strings);
+  while ((value= strsep(&string," ")))
+    {
+      if (*value)
+        add_to_strlist2 (&values,value,utf8_strings);
+    }
 
   item=m_alloc(sizeof(struct groupitem));
   item->name=name;