diff --git a/TODO b/TODO
index 5d5370ba2..38e2ce719 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,10 @@ Important
     * Allow the use of a the faked RNG only for keys which are
       flagged as INSECURE.
 
+> 0.9.1: I get some occasional segfaults during 'make check' unless I use
+> --with-included-zlib. It's strange, I have zlib-1.1.2 on one machine, and
+> zlib-1.1.3 on another, and both of them fail on occasion (maybe half of the
+
 
 Needed
 ------
diff --git a/VERSION b/VERSION
index f374f6662..df6b01fec 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.9.1
+0.9.1a
diff --git a/g10/ChangeLog b/g10/ChangeLog
index f42b743b1..d91abd1c9 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+Sun Jan 10 15:10:02 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
+
+	* armor.c (fake_packet): Fixed not-dash-escaped bug.
+
 Sat Jan  9 16:02:23 CET 1999  Werner Koch  <wk@isil.d.shuttle.de>
 
 	* sig-check.c (do_check): Output time diff on error
diff --git a/g10/armor.c b/g10/armor.c
index ab49cc680..40c6618f8 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -499,7 +499,8 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
 	else {
 	    while( len < size && afx->buffer_pos < afx->buffer_len )
 		buf[len++] = afx->buffer[afx->buffer_pos++];
-	    if( afx->buffer_pos >= afx->buffer_len ) {
+	    if( afx->buffer_pos >= afx->buffer_len
+		&& !afx->not_dash_escaped ) {
 		buf[len++] = '\r';
 		buf[len++] = '\n';
 	    }
@@ -518,7 +519,9 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
 	}
 	if( !maxlen )
 	    afx->truncated++;
-	afx->buffer_len = trim_trailing_spaces( afx->buffer, afx->buffer_len );
+	if( !afx->not_dash_escaped )
+	    afx->buffer_len = trim_trailing_spaces( afx->buffer,
+						    afx->buffer_len );
 	p = afx->buffer;
 	n = afx->buffer_len;
 
@@ -540,7 +543,7 @@ fake_packet( armor_filter_context_t *afx, IOBUF a,
 		    putc('\n', stderr);
 		}
 		lastline = 1;
-		if( len >= 2 )
+		if( len >= 2 && !afx->not_dash_escaped )
 		    len -= 2; /* remove the last CR,LF */
 		rc = -1;
 	    }
@@ -726,7 +729,7 @@ armor_filter( void *opaque, int control,
     int  idx, idx2;
     size_t n=0;
     u32 crc;
-  #if 0
+  #if 1
     static FILE *fp ;
 
     if( !fp ) {
@@ -824,7 +827,7 @@ armor_filter( void *opaque, int control,
 	}
 	else
 	    rc = radix64_read( afx, a, &n, buf, size );
-      #if 0
+      #if 1
 	if( n )
 	    if( fwrite(buf, n, 1, fp ) != 1 )
 		BUG();