diff --git a/gnupg.c b/gnupg.c
index c52a9b2..cc4c4fa 100644
--- a/gnupg.c
+++ b/gnupg.c
@@ -524,6 +524,22 @@ PHP_MINIT_FUNCTION(gnupg)
 	PHP_GNUPG_SET_CLASS_CONST("ERROR_WARNING",      1);
 	PHP_GNUPG_SET_CLASS_CONST("ERROR_EXCEPTION",    2);
 	PHP_GNUPG_SET_CLASS_CONST("ERROR_SILENT",       3);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_RSA",		GPGME_PK_RSA);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_RSA_E",		GPGME_PK_RSA_E);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_RSA_S",		GPGME_PK_RSA_S);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_DSA",		GPGME_PK_DSA);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_ELG",		GPGME_PK_ELG);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_ELG_E",		GPGME_PK_ELG_E);
+#if GPGME_VERSION_NUMBER >= 0x010500  /* GPGME >= 1.5.0 */
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_ECC",		GPGME_PK_ECC);
+#endif /* gpgme >= 1.5.0 */	
+#if GPGME_VERSION_NUMBER >= 0x010300  /* GPGME >= 1.3.0 */
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_ECDSA",		GPGME_PK_ECDSA);
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_ECDH",		GPGME_PK_ECDH);
+#endif /* gpgme >= 1.3.0 */	
+#if GPGME_VERSION_NUMBER >= 0x010700  /* GPGME >= 1.7.0 */
+	PHP_GNUPG_SET_CLASS_CONST("GNUPG_PK_EDDSA",		GPGME_PK_EDDSA);
+#endif /* gpgme >= 1.7.0 */
 
 	PHP_GNUPG_REG_CONST("GNUPG_SIG_MODE_NORMAL",    GPGME_SIG_MODE_NORMAL);
 	PHP_GNUPG_REG_CONST("GNUPG_SIG_MODE_DETACH",    GPGME_SIG_MODE_DETACH);
@@ -550,6 +566,22 @@ PHP_MINIT_FUNCTION(gnupg)
 	PHP_GNUPG_REG_CONST("GNUPG_ERROR_WARNING",      1);
 	PHP_GNUPG_REG_CONST("GNUPG_ERROR_EXCEPTION",    2);
 	PHP_GNUPG_REG_CONST("GNUPG_ERROR_SILENT",       3);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_RSA",				GPGME_PK_RSA);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_RSA_E",			GPGME_PK_RSA_E);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_RSA_S",			GPGME_PK_RSA_S);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_DSA",				GPGME_PK_DSA);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_ELG",				GPGME_PK_ELG);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_ELG_E",			GPGME_PK_ELG_E);
+#if GPGME_VERSION_NUMBER >= 0x010500  /* GPGME >= 1.5.0 */
+	PHP_GNUPG_REG_CONST("GNUPG_PK_ECC",				GPGME_PK_ECC);
+#endif /* gpgme >= 1.5.0 */	
+#if GPGME_VERSION_NUMBER >= 0x010300  /* GPGME >= 1.3.0 */
+	PHP_GNUPG_REG_CONST("GNUPG_PK_ECDSA",			GPGME_PK_ECDSA);
+	PHP_GNUPG_REG_CONST("GNUPG_PK_ECDH",			GPGME_PK_ECDH);
+#endif /* gpgme >= 1.3.0 */	
+#if GPGME_VERSION_NUMBER >= 0x010700  /* GPGME >= 1.7.0 */
+	PHP_GNUPG_REG_CONST("GNUPG_PK_EDDSA",			GPGME_PK_EDDSA);
+#endif /* gpgme >= 1.7.0 */
 
 	/* init gpgme subsystems and set the returned version to the constant */
 	strncpy(php_gpgme_version, gpgme_check_version(NULL), PHP_GNUPG_VERSION_BUF_SIZE);