diff --git a/common/util.h b/common/util.h
index acda2646e..4564009ce 100644
--- a/common/util.h
+++ b/common/util.h
@@ -39,12 +39,11 @@
  * libgpg-error version.  Define them here.
  * Example: (#if GPG_ERROR_VERSION_NUMBER < 0x011500 // 1.21)
  */
-#if GPG_ERROR_VERSION_NUMBER < 0x012f00 /* 1.47 */
-# define GPG_ERR_BAD_PUK          320
-# define GPG_ERR_NO_RESET_CODE    321
-# define GPG_ERR_BAD_RESET_CODE   322
+#if GPGRT_VERSION_NUMBER  < 0x013800 /* 1.56 */
+# define GPG_ERR_UNEXPECTED_PACKET 216
 #endif
 
+
 #ifndef EXTERN_UNLESS_MAIN_MODULE
 # if !defined (INCLUDED_BY_MAIN_MODULE)
 #  define EXTERN_UNLESS_MAIN_MODULE extern
diff --git a/g10/gpg.c b/g10/gpg.c
index 5f9a4b042..296d5fceb 100644
--- a/g10/gpg.c
+++ b/g10/gpg.c
@@ -1058,6 +1058,7 @@ static struct compatibility_flags_s compatibility_flags [] =
   {
     { COMPAT_PARALLELIZED, "parallelized" },
     { COMPAT_T7014_OLD,    "t7014-old" },
+    { COMPAT_COMPR_KEYS,   "compr-keys" },
     { 0, NULL }
   };
 
diff --git a/g10/import.c b/g10/import.c
index 9fbebf39d..48f0d5459 100644
--- a/g10/import.c
+++ b/g10/import.c
@@ -1058,7 +1058,12 @@ read_block( IOBUF a, unsigned int options,
       switch (pkt->pkttype)
         {
         case PKT_COMPRESSED:
-          if (check_compress_algo (pkt->pkt.compressed->algorithm))
+          if (!(opt.compat_flags & COMPAT_COMPR_KEYS))
+            {
+              rc = GPG_ERR_UNEXPECTED_PACKET;
+              goto ready;
+            }
+          else if (check_compress_algo (pkt->pkt.compressed->algorithm))
             {
               rc = GPG_ERR_COMPR_ALGO;
               goto ready;
diff --git a/g10/options.h b/g10/options.h
index 59a3cab73..fe81a0baf 100644
--- a/g10/options.h
+++ b/g10/options.h
@@ -399,7 +399,7 @@ EXTERN_UNLESS_MAIN_MODULE int memory_stat_debug_mode;
 /* Compatibility flags */
 #define COMPAT_PARALLELIZED   1  /* Use threaded hashing for signatures.  */
 #define COMPAT_T7014_OLD      2  /* Use initial T7014 test data.  */
-
+#define COMPAT_COMPR_KEYS     4  /* Allow import of compressed keys. (T7014) */
 
 /* Compliance test macros.  */
 #define GNUPG   (opt.compliance==CO_GNUPG || opt.compliance==CO_DE_VS)