diff --git a/CHANGES b/CHANGES
index 0325df3e82e9051335a3e5db1e487ef14c93b97b..b0e9c15519c448e6aad01171baec7283d05654f7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,11 @@
 
  Changes between 0.9.6 and 0.9.7  [xx XXX 2000]
 
+  *) Disable stdin buffering in load_cert (apps/apps.c) so that no certs are
+     skipped when using openssl x509 multiple times on a single input file,
+     e.g. "(openssl x509 -out cert1; openssl x509 -out cert2) <certs".
+     [Bodo Moeller]
+
   *) Make ASN1_UTCTIME_set_string() and ASN1_GENERALIZEDTIME_set_string()
      set string type: to handle setting ASN1_TIME structures. Fix ca
      utility to correctly initialize revocation date of CRLs.
diff --git a/apps/apps.c b/apps/apps.c
index ddc4df077343c02baf65d06bf9fa3de057e2d72e..a1397a36d8f60c2bd97ca04c5a20aa9832b03541 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -476,7 +476,10 @@ X509 *load_cert(BIO *err, char *file, int format)
 		}
 
 	if (file == NULL)
+		{
+		setvbuf(stdin, NULL, _IONBF, 0);
 		BIO_set_fp(cert,stdin,BIO_NOCLOSE);
+		}
 	else
 		{
 		if (BIO_read_filename(cert,file) <= 0)