diff --git a/ChangeLog b/ChangeLog
index bc21c9b4f..d58df3a37 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -10,6 +10,7 @@ Bugfix
      (found by Matthew Page)
    * Typos in platform.c and pkcs11.c (found by Daniel Phillips and Steffan
      Karger)
+   * cert_write app should use subject of issuer certificate as issuer of cert
 
 = PolarSSL 1.3.6 released on 2014-04-11
 
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index b4fc4500f..31b52054f 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -409,7 +409,7 @@ int main( int argc, char *argv[] )
         }
 
         ret = x509_dn_gets( issuer_name, sizeof(issuer_name),
-                                 &issuer_crt.issuer );
+                                 &issuer_crt.subject );
         if( ret < 0 )
         {
             polarssl_strerror( ret, buf, 1024 );