diff --git a/lib/krb5/krb5.h b/lib/krb5/krb5.h
index 211bfbcd3..23c5a1e54 100644
--- a/lib/krb5/krb5.h
+++ b/lib/krb5/krb5.h
@@ -96,17 +96,11 @@ typedef enum krb5_enctype {
   ETYPE_DES_CBC_MD4		= 2,
   ETYPE_DES_CBC_MD5		= 3,
   ETYPE_DES3_CBC_MD5		= 5,
-#if NEW_DES3_CODE
-  ETYPE_NEW_DES3_CBC_SHA1	= 7,
-  ETYPE_DES3_CBC_SHA1		= ETYPE_NEW_DES3_CBC_SHA1,
-#else
   ETYPE_OLD_DES3_CBC_SHA1	= 7,
-  ETYPE_NEW_DES3_CBC_SHA1	= 99,
-  ETYPE_DES3_CBC_SHA1		= ETYPE_OLD_DES3_CBC_SHA1,
-#endif
   ETYPE_SIGN_DSA_GENERATE	= 8,
   ETYPE_ENCRYPT_RSA_PRIV	= 9,
   ETYPE_ENCRYPT_RSA_PUB		= 10,
+  ETYPE_DES3_CBC_SHA1		= 16, /* with key derivation */
   ETYPE_ENCTYPE_PK_CROSS	= 48,
   ETYPE_DES_CBC_NONE		= 0x1000,
   ETYPE_DES3_CBC_NONE		= 0x1001