diff --git a/pgp.h b/pgp.h
index eff888f73b07e11c17adce913e259720183b48bc..b9103ebda50f5e1e7b56f4a1e199112bf7f09391 100644
--- a/pgp.h
+++ b/pgp.h
@@ -26,6 +26,8 @@
 #ifndef NETTLE_PGP_H_INCLUDED
 #define NETTLE_PGP_H_INCLUDED
 
+#include <time.h>
+
 #include "bignum.h"
 
 /* Name mangling */
@@ -203,8 +205,27 @@ enum pgp_signature_type
 
 enum pgp_subpacket_tag
   {
-    /* FIXME: XXX just to it by the compiler */
-    PGP_SUBPACKET_ISSUER = 0,
+    PGP_SUBPACKET_CREATION_TIME = 2,
+    PGP_SUBPACKET_SIGNATURE_EXPIRATION_TIME = 3,
+    PGP_SUBPACKET_EXPORTABLE_CERTIFICATION = 4,
+    PGP_SUBPACKET_TRUST_SIGNATURE = 5,
+    PGP_SUBPACKET_REGULAR_EXPRESSION = 6,
+    PGP_SUBPACKET_REVOCABLE = 7,
+    PGP_SUBPACKET_KEY_EXPIRATION_TIME = 9,
+    PGP_SUBPACKET_PLACEHOLDER = 10 ,
+    PGP_SUBPACKET_PREFERRED_SYMMETRIC_ALGORITHMS = 11,
+    PGP_SUBPACKET_REVOCATION_KEY = 12,
+    PGP_SUBPACKET_ISSUER_KEY_ID = 16,
+    PGP_SUBPACKET_NOTATION_DATA = 20,
+    PGP_SUBPACKET_PREFERRED_HASH_ALGORITHMS = 21,
+    PGP_SUBPACKET_PREFERRED_COMPRESSION_ALGORITHMS = 22,
+    PGP_SUBPACKET_KEY_SERVER_PREFERENCES = 23,
+    PGP_SUBPACKET_PREFERRED_KEY_SERVER = 24,
+    PGP_SUBPACKET_PRIMARY_USER_ID = 25,
+    PGP_SUBPACKET_POLICY_URL = 26,
+    PGP_SUBPACKET_KEY_FLAGS = 27,
+    PGP_SUBPACKET_SIGNERS_USER_ID = 28,
+    PGP_SUBPACKET_REASON_FOR_REVOCATION = 29,
   };
 
 #endif /* NETTLE_PGP_H_INCLUDED */