diff --git a/g10/export.c b/g10/export.c
index d9ca9c089..a8ac6d8cf 100644
--- a/g10/export.c
+++ b/g10/export.c
@@ -340,6 +340,21 @@ do_export_stream( IOBUF out, STRLIST users, int secret,
 		  default:
 		    break;
 		  }
+                
+                /* XXX: before skipping a subkey, check whether any
+                   other description wants an exact macth on a subkey
+                   and include that subkey into the output too.  Need
+                   to add this subkey to a list so that it won't get
+                   processed a second time. 
+                   
+                   So the first step here is to check that list and
+                   skip in any case if the key is in that list.
+
+                   We need this whole mess becuase the import fnction
+                   is not able to merge secret key and thus it is not
+                   possible to output them as two keys and have import
+                   merge them.
+                  */
 
 		if(skip_until_subkey)
 		  continue;
diff --git a/po/ChangeLog b/po/ChangeLog
index acffb8069..130e1d0ad 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2005-10-06  Werner Koch  <wk@g10code.com>
+
+	* POTFILES.in: s/g10.c/gpg.c/.
+
 2005-07-26  Werner Koch  <wk@g10code.com>
 
 	* zh_TW.po, fr.po, cs.po: Updated.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f8450de5b..a190ab780 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -19,7 +19,7 @@ g10/encode.c
 g10/encr-data.c
 g10/exec.c
 g10/export.c
-g10/g10.c
+g10/gpg.c
 g10/getkey.c
 g10/gpgv.c
 g10/helptext.c