diff --git a/TODO b/TODO
index 1f09631ce..f66b6a7ab 100644
--- a/TODO
+++ b/TODO
@@ -1,18 +1,9 @@
 
-  * Pot the lsign flag into the hashed area.
-
-  * check whether the "n signatures not checked due to missing keys"
-    from --edit/check can be due to revoked signatures.  Chnage the
-    wording in this case.
-
-  * Remove all references to the local-ID from the docs
- 
-  * What about adding a feture -word to the +wordlist search mode.
-
   * getkey does not return revoked/expired keys - therefore it is not
     possible to override it.
 
   * Selection using +wordlist does not work.
+    What about adding a feature -word to the +wordlist search mode.
 
   * add listing of notation data
 
@@ -96,24 +87,28 @@
     [David is working on this]
 
   * Check the beginning of file to detect already compressed files (gzip,
-    bzip2, xdelta and some picture formats)
+    bzip2, xdelta and some picture formats)  [Timo has some code for this]
 
   * Get new assembler stuff from gmp 3.1
 
   * Use new-format headers for compressed packets.
-    The advantage is that a garbled zip file can be better detected.
+    The advantage is that a garbled zip files can be better detected.
  
-
-Nice to have
-------------
   * use DEL and ^H for erasing the previous character (util/ttyio.c).
     or better readline.
+
   * Print a warning if the directory mode is wrong.
+
   * preferences of hash algorithms are not yet used.
+
   * add test cases for invalid data (scrambled armor or other random data)
+
   * add checking of armor trailers
+
   * the pubkey encrypt functions should do some sanity checks.
+
   * "gpg filename.tar.gz.asc" should work like --verify (-sab).
+
   * for messages created with "-t", it might make sense to append the
     verification status of the message to the output (i.e. write something to
     the --output file and not only to stderr.
@@ -124,3 +119,5 @@ Things we won't do
 
   * New option --file-remove path-to-wipe-program ? 
 
+
+
diff --git a/doc/DETAILS b/doc/DETAILS
index 66563663b..025a938b9 100644
--- a/doc/DETAILS
+++ b/doc/DETAILS
@@ -38,11 +38,7 @@ ssb::1536:20:5CE086B5B5A18FF4:1998-07-07:0:::
  5. Field:  KeyID
  6. Field:  Creation Date (in UTC)
  7. Field:  Key expiration date or empty if none.
- 8. Field:  Local ID: record number of the dir record in the trustdb.
-	    This value is only valid as long as the trustdb is not
-	    deleted. You can use "#<local-id> as the user id when
-	    specifying a key. This is needed because keyids may not be
-	    unique - a program may use this number to access keys later.
+ 8. Field:  reserved (used to be the Local-ID)
  9. Field:  Ownertrust (primary public keys only)
 	    This is a single letter, but be prepared that additional
 	    information may follow in some future versions.
@@ -440,6 +436,8 @@ describes the record type.  All numeric values are stored in network
 byte order. The length of each record is 40 bytes. The first record of
 the DB is always of type 1 and this is the only record of this type.
 
+FIXME:  The layout changed, document it here.
+
   Record type 0:
   --------------
     Unused record, can be reused for any purpose.
diff --git a/doc/gpg.sgml b/doc/gpg.sgml
index 120eb2efe..2c07e7c8b 100644
--- a/doc/gpg.sgml
+++ b/doc/gpg.sgml
@@ -1657,16 +1657,6 @@ digits, the underscore and all characters with bit 7 set.
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
-<term>#34</term>
-<listitem><para>
-Using the Local ID.  This is a very low level method and should
-only be used by applications which really need it.  The hash character
-indicates this method.	An application should not assume that this is
-only a number.
-</para></listitem>
-</varlistentry>
-
 <varlistentry>
 <term>Heine</term>
 <term>*Heine</term>
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 7e5de401d..6d5bbe318 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2001-10-22  Werner Koch  <wk@gnupg.org>
+
+	* build-packet.c (build_sig_subpkt): Default is now to put all
+	types of subpackets into the hashed area and only list those which
+	should go into the unhashed area.
+
 2001-10-18  Werner Koch  <wk@gnupg.org>
 
 	* keydb.c (keydb_add_resource): Rearranged the way we keep track
diff --git a/g10/build-packet.c b/g10/build-packet.c
index 271fd0920..1b0351e97 100644
--- a/g10/build-packet.c
+++ b/g10/build-packet.c
@@ -773,20 +773,13 @@ build_sig_subpkt (PKT_signature *sig, sigsubpkttype_t type,
 	nlen = 1; /* just a 1 byte length header */
 
     switch( type ) {
-      case SIGSUBPKT_SIG_CREATED:
-      case SIGSUBPKT_PREF_SYM:
-      case SIGSUBPKT_PREF_HASH:
-      case SIGSUBPKT_PREF_COMPR:
-      case SIGSUBPKT_KS_FLAGS:
-      case SIGSUBPKT_KEY_EXPIRE:
-      case SIGSUBPKT_NOTATION:
-      case SIGSUBPKT_POLICY:
-      case SIGSUBPKT_REVOC_REASON:
-      case SIGSUBPKT_PRIMARY_UID:
-      case SIGSUBPKT_KEY_FLAGS:
-      case SIGSUBPKT_FEATURES:
-	       hashed = 1; break;
-      default: hashed = 0; break;
+      case SIGSUBPKT_ISSUER:
+      case SIGSUBPKT_PRIV_VERIFY_CACHE: /*(obsolete)*/
+        hashed = 0;
+        break;
+      default: 
+        hashed = 1;
+        break;
     }
 
     if( critical )