diff --git a/bin/tests/system/feature-test.c b/bin/tests/system/feature-test.c
index c2032f8ce6..72c09ae04b 100644
--- a/bin/tests/system/feature-test.c
+++ b/bin/tests/system/feature-test.c
@@ -42,7 +42,7 @@ usage(void) {
 	fprintf(stderr, "\t--ipv6only=no\n");
 	fprintf(stderr, "\t--tsan\n");
 	fprintf(stderr, "\t--with-dlz-filesystem\n");
-	fprintf(stderr, "\t--with-idn\n");
+	fprintf(stderr, "\t--with-libidn2\n");
 	fprintf(stderr, "\t--with-lmdb\n");
 	fprintf(stderr, "\t--with-libnghttp2\n");
 }
@@ -156,7 +156,7 @@ main(int argc, char **argv) {
 #endif /* ifdef DLZ_FILESYSTEM */
 	}
 
-	if (strcmp(argv[1], "--with-idn") == 0) {
+	if (strcmp(argv[1], "--with-libidn2") == 0) {
 #ifdef HAVE_LIBIDN2
 		return (0);
 #else  /* ifdef HAVE_LIBIDN2 */
diff --git a/bin/tests/system/idna/tests.sh b/bin/tests/system/idna/tests.sh
index 5cb1c41a67..e16809f81b 100644
--- a/bin/tests/system/idna/tests.sh
+++ b/bin/tests/system/idna/tests.sh
@@ -383,7 +383,7 @@ idna_disabled_test() {
 
 # Main test begins here
 
-$FEATURETEST --with-idn
+$FEATURETEST --with-libidn2
 if [ $? -eq 0 ]; then
     idna_enabled_test
 else
diff --git a/doc/arm/general.rst b/doc/arm/general.rst
index 225576be7a..ef22207e49 100644
--- a/doc/arm/general.rst
+++ b/doc/arm/general.rst
@@ -585,9 +585,9 @@ is accepted but not returned in responses.
 and NXTs in responses, rather than relying on the resolving server
 to perform separate queries for missing SIGs and NXTs.
 
-[19] BIND 9 requires ``--with-idn`` to enable entry of IDN labels within dig,
-host, and nslookup at compile time.  ACE labels are supported
-everywhere with or without ``--with-idn``.
+[19] BIND 9 requires ``--with-libidn2`` to enable entry of IDN labels within
+dig, host, and nslookup at compile time.  ACE labels are supported
+everywhere with or without ``--with-libidn2``.
 
 [20] Section 5.1 - DNAME records are fully supported.
 
diff --git a/doc/misc/rfc-compliance b/doc/misc/rfc-compliance
index c1694c9b16..461a73b751 100644
--- a/doc/misc/rfc-compliance
+++ b/doc/misc/rfc-compliance
@@ -143,9 +143,9 @@ retrieve unknown keys.
 
 [6] Section 4 is ignored.
 
-[7] Requires --with-idn to enable entry of IDN labels within dig,
+[7] Requires --with-libidn2 to enable entry of IDN labels within dig,
 host and nslookup at compile time.  ACE labels are supported
-everywhere with or without --with-idn.
+everywhere with or without --with-libidn2.
 
 [8] Section 5.1 - DNAME records are fully supported.