diff --git a/lib/asn1/setchgpw2.asn1 b/lib/asn1/setchgpw2.asn1
index 66f5287d1..9dcc0737f 100644
--- a/lib/asn1/setchgpw2.asn1
+++ b/lib/asn1/setchgpw2.asn1
@@ -3,7 +3,7 @@
 SETCHGPW2 DEFINITIONS ::=
 BEGIN
 
-IMPORTS PrincipalName, Realm FROM krb5;
+IMPORTS PrincipalName, Realm, ENCTYPE FROM krb5;
 
 ProtocolErrorCode ::= ENUMERATED {
 	generic-error(0),
@@ -22,8 +22,6 @@ Key	::= SEQUENCE {
 	...
 }
 
-Etype ::= INTEGER
-
 Language-Tag	::= UTF8String    -- Constrained by RFC3066
 
 LangTaggedText	::= SEQUENCE {
@@ -42,14 +40,14 @@ Err-null ::= NULL
 Req-change-pw ::= SEQUENCE {
 	old-pw[0]	UTF8String,
 	new-pw[1]	UTF8String OPTIONAL,
-	etypes[2]	SEQUENCE OF Etype OPTIONAL,
+	etypes[2]	SEQUENCE OF ENCTYPE OPTIONAL,
 	...
 }
 
 Rep-change-pw ::= SEQUENCE {
 	info-text[0]	UTF8String OPTIONAL,
 	new-pw[1]	UTF8String OPTIONAL,
-	etypes[2]	SEQUENCE OF Etype OPTIONAL
+	etypes[2]	SEQUENCE OF ENCTYPE OPTIONAL
 }
 
 Err-change-pw ::= SEQUENCE {
@@ -68,7 +66,7 @@ Err-change-pw ::= SEQUENCE {
 
 -- Change/Set keys
 Req-set-keys ::= SEQUENCE {
-	etypes[0]	SEQUENCE OF Etype,
+	etypes[0]	SEQUENCE OF ENCTYPE,
 	entropy[1]	OCTET STRING,
 	...
 }
@@ -87,7 +85,7 @@ Rep-set-keys ::= SEQUENCE {
 
 Err-set-keys ::= SEQUENCE {
 	help-text[0]		UTF8String OPTIONAL,
-	enctypes[1]		SEQUENCE OF Etype OPTIONAL,
+	enctypes[1]		SEQUENCE OF ENCTYPE OPTIONAL,
 	code[1]		ENUMERATED {
 		etype-no-support(0),
 		...
@@ -125,7 +123,7 @@ Err-get-princ-aliases ::= NULL
 -- Get list of encryption types supported by KDC for new types
 Req-get-supported-etypes ::= NULL
 
-Rep-get-supported-etypes ::= SEQUENCE OF Etype
+Rep-get-supported-etypes ::= SEQUENCE OF ENCTYPE
 
 Err-get-supported-etypes ::= NULL