diff --git a/BUGS b/BUGS
index 27e37940c..785a1d656 100644
--- a/BUGS
+++ b/BUGS
@@ -48,5 +48,24 @@ and after about half a day in the rsync snapshots.
     --> IRIX bug still there
 
 
-Next #13
+[  *] #13 1999-04-05
+    Trying to generate very large keys fails with a BUG in read_pool()
+
+
+[  *] #14 1999-04-05 <anonymous>
+    If you have the following lines in your "options" file:
+      load-extension twofish
+      cipher-algo twofish
+      s2k-cipher-algo twofish
+    and then try to "gpg --gen-key", everything goes along fine until you
+    verify your password. Then the program crashes with a BUG at line 226
+    of passphrase.c.
+
+
+[ **] #15 199-04-05
+    Hash calculation for subkey bindings is not according to rfc2440 if
+    a 4 byte length header is used for the subkey.
+
+
+Next #16
 
diff --git a/g10/armor.c b/g10/armor.c
index cadebadbb..c49dc5cad 100644
--- a/g10/armor.c
+++ b/g10/armor.c
@@ -30,7 +30,6 @@
 #include "iobuf.h"
 #include "memory.h"
 #include "util.h"
-#include "iobuf.h"
 #include "filter.h"
 #include "packet.h"
 #include "options.h"
diff --git a/g10/mainproc.c b/g10/mainproc.c
index dd91fcc5e..bb78f4b4e 100644
--- a/g10/mainproc.c
+++ b/g10/mainproc.c
@@ -33,7 +33,6 @@
 #include "cipher.h"
 #include "keydb.h"
 #include "filter.h"
-#include "cipher.h"
 #include "main.h"
 #include "status.h"
 #include "i18n.h"