diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog
index 00449dc5..9ead585e 100644
--- a/gpgme/ChangeLog
+++ b/gpgme/ChangeLog
@@ -1,3 +1,9 @@
+2001-12-14  Marcus Brinkmann  <marcus@g10code.de>
+
+	* engine-gpgsm.c (gpgsm_status_handler): Freeze the output file
+	handler when ending this operation, otherwise the wait function
+	will sit on it.
+
 2001-12-14  Marcus Brinkmann  <marcus@g10code.de>
 
 	* engine-gpgsm.c (struct gpgsm_object_s): New member colon.attic.
diff --git a/gpgme/engine-gpgsm.c b/gpgme/engine-gpgsm.c
index 456de4f9..775d44ae 100644
--- a/gpgme/engine-gpgsm.c
+++ b/gpgme/engine-gpgsm.c
@@ -536,6 +536,8 @@ gpgsm_status_handler (void *opaque, int pid, int fd)
 	  /* FIXME Save error somewhere.  */
 	  if (gpgsm->status.fnc)
 	    gpgsm->status.fnc (gpgsm->status.fnc_value, STATUS_EOF, "");
+	  if (gpgsm->output_fd)
+	    _gpgme_freeze_fd (gpgsm->output_fd);
 	  return 1;
 	}