diff --git a/g10/ChangeLog b/g10/ChangeLog
index e9ec15c89..6f7cc86bb 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-15  David Shaw  <dshaw@jabberwocky.com>
+
+	* build-packet.c (do_user_id): Do not force a header for attribute
+	packets as they require a new CTB, and we don't support forced
+	headers for new CTBs yet.
+
 2004-02-14  David Shaw  <dshaw@jabberwocky.com>
 
 	* build-packet.c (write_header2): If a suggested header length is
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 5098d9e83..ad0619052 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -208,9 +208,7 @@ do_user_id( IOBUF out, int ctb, PKT_user_id *uid )
 {
     if( uid->attrib_data )
       {
-	/* Shouldn't be necessary to force a header here since attribs
-	   can't be of zero length, but it doesn't hurt either. */
-	write_header2(out, ctb, uid->attrib_len, 1, 1);
+	write_header(out, ctb, uid->attrib_len);
 	if( iobuf_write( out, uid->attrib_data, uid->attrib_len ) )
 	  return G10ERR_WRITE_FILE;
       }