diff --git a/drivers/snmp-ups.c b/drivers/snmp-ups.c

index fad099764..bb78832d0 100644

--- a/drivers/snmp-ups.c

+++ b/drivers/snmp-ups.c

@@ -980,14 +980,14 @@ net-snmp/library/keytools.h:   int    generate_Ku(const oid * hashtype, u_int ha

 		}

 		else

 #endif

-#if NUT_HAVE_LIBNETSNMP_usmAESPrivProtocol || NUT_HAVE_LIBNETSNMP_usmAES128PrivProtocol

+#if 0

 		if (strcmp(privProtocol, "AES") == 0) {

 			g_snmp_sess.securityPrivProto = usmAESPrivProtocol;

 			g_snmp_sess.securityPrivProtoLen = NUT_securityPrivProtoLen;

 		}

 		else

 #endif

-#if NUT_HAVE_LIBNETSNMP_DRAFT_BLUMENTHAL_AES_04

+#if 0

 # if NUT_HAVE_LIBNETSNMP_usmAES192PrivProtocol

 		if (strcmp(privProtocol, "AES192") == 0) {

 			g_snmp_sess.securityPrivProto = usmAES192PrivProtocol;

diff --git a/tools/nut-scanner/scan_snmp.c b/tools/nut-scanner/scan_snmp.c

index 48bdaaa25..4ab978424 100644

--- a/tools/nut-scanner/scan_snmp.c

+++ b/tools/nut-scanner/scan_snmp.c

@@ -689,7 +689,7 @@ static int init_session(struct snmp_session * snmp_sess, nutscan_snmp_t * sec)

 #endif

 		if (sec->privProtocol) {

-#if NUT_HAVE_LIBNETSNMP_usmAESPrivProtocol || NUT_HAVE_LIBNETSNMP_usmAES128PrivProtocol

+#if 0

 			if (strcmp(sec->privProtocol, "AES") == 0) {

 				snmp_sess->securityPrivProto = nut_usmAESPrivProtocol;

 				snmp_sess->securityPrivProtoLen =

@@ -698,7 +698,7 @@ static int init_session(struct snmp_session * snmp_sess, nutscan_snmp_t * sec)

 			}

 			else

 #endif

-#if NUT_HAVE_LIBNETSNMP_DRAFT_BLUMENTHAL_AES_04

+#if 0

 # if NUT_HAVE_LIBNETSNMP_usmAES192PrivProtocol

 			if (strcmp(sec->privProtocol, "AES192") == 0) {

 				snmp_sess->securityPrivProto = nut_usmAES192PrivProtocol;

-- 

2.33.5