diff --git a/NEWS b/NEWS
index 14455b5d8..3ffe6fabc 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 Noteworthy changes in version 2.0.5
 ------------------------------------------------
 
+ * Fixed bug when using the --p12-charset without --armor.
+
 
 Noteworthy changes in version 2.0.4 (2007-05-09)
 ------------------------------------------------
diff --git a/sm/ChangeLog b/sm/ChangeLog
index d4af923a2..ddd392280 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,8 @@
+2007-05-29  Werner Koch  <wk@g10code.com>
+
+	* export.c (gpgsm_p12_export): Print passphrase encoding info only
+	in PEM mode.
+
 2007-05-18  Marcus Brinkmann  <marcus@g10code.de>
 
 	* qualified.c (gpgsm_qualified_consent,
diff --git a/sm/export.c b/sm/export.c
index ec8a764c3..93b74bf7b 100644
--- a/sm/export.c
+++ b/sm/export.c
@@ -416,7 +416,7 @@ gpgsm_p12_export (ctrl_t ctrl, const char *name, FILE *fp)
       putc ('\n', fp);
     }
 
-  if (opt.p12_charset)
+  if (opt.p12_charset && ctrl->create_pem)
     {
       fprintf (fp, "The passphrase is %s encoded.\n\n",
                opt.p12_charset);