diff --git a/CHANGES b/CHANGES
index 0ab20f6845..c280ff44dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,5 @@
+5262.	[func]		Removed support for the legacy GeoIP API. [GL #1112]
+
 5261.	[cleanup]	Remove SO_BSDCOMPAT socket option usage.
 
 5260.	[bug]		dnstap-read was producing malformed output for large
@@ -10,9 +12,6 @@
 			will be compiled in by default if the "libmaxminddb"
 			library is found at compile time, but can be
 			suppressed using "configure --without-geoip2".
-			The legacy GeoIP API can be enabled by using
-			"configure --with-geoip". This cannot be used
-			together with GeoIP2.
 
 			Certain geoip ACL settings that were available with
 			legacy GeoIP are not available when using GeoIP2.
diff --git a/README b/README
index a5655f0dad..ea7b28cc1e 100644
--- a/README
+++ b/README
@@ -205,10 +205,11 @@ To support storing configuration data for runtime-added zones in an LMDB
 database, the server must be linked with liblmdb. If this is installed in
 a nonstandard location, specify the prefix using with-lmdb=/prefix.
 
-To support GeoIP location-based ACLs, the server must be linked with
-libGeoIP. This is not turned on by default; BIND must be configured with
---with-geoip. If the library is installed in a nonstandard location,
-specify the prefix using --with-geoip=/prefix.
+To support MaxMind GeoIP2 location-based ACLs, the server must be linked
+with libmaxminddb. This is turned on by default if the library is found;
+if the library is installed in a nonstandard location, specify the prefix
+using --with-maxminddb=/prefix. GeoIP2 support can be switched off with
+--disable-geoip.
 
 For DNSTAP packet logging, you must have installed libfstrm https://
 github.com/farsightsec/fstrm and libprotobuf-c https://
diff --git a/README.md b/README.md
index 198303d0cb..c5e7d916d9 100644
--- a/README.md
+++ b/README.md
@@ -217,10 +217,11 @@ To support storing configuration data for runtime-added zones in an LMDB
 database, the server must be linked with liblmdb. If this is installed in a
 nonstandard location, specify the prefix using `with-lmdb=/prefix`.
 
-To support GeoIP location-based ACLs, the server must be linked with
-libGeoIP. This is not turned on by default; BIND must be configured with
-`--with-geoip`. If the library is installed in a nonstandard location,
-specify the prefix using `--with-geoip=/prefix`.
+To support MaxMind GeoIP2 location-based ACLs, the server must be linked
+with `libmaxminddb`. This is turned on by default if the library is
+found; if the library is installed in a nonstandard location,
+specify the prefix using `--with-maxminddb=/prefix`. GeoIP2 support
+can be switched off with `--disable-geoip`.
 
 For DNSTAP packet logging, you must have installed libfstrm
 [https://github.com/farsightsec/fstrm](https://github.com/farsightsec/fstrm)
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index e0fc511712..37ba6fcd8a 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -4555,7 +4555,7 @@ badresp:1,adberr:0,findfail:0,valfail:0]
 	    <listitem>
 	      <para>
 		When <command>named</command> is compiled using the
-		MaxMind GeoIP2 geolocation API, or the legacy GeoIP API,
+		MaxMind GeoIP2 geolocation API,
 		this specifies the directory containing GeoIP
 		database files.  By default, the option is set based on
 		the prefix used to build the <command>libmaxminddb</command>
@@ -16864,9 +16864,7 @@ zone "example.com" {
 	  specified, then these queries will be answered from the "city",
 	  database if it is installed, or the "country" database if it
 	  is installed, in that order. Valid database names are
-	  "country", "city", "asnum", "isp", and "domain". (If using
-	  the legacy GeoIP API, "netspeed" and "org" databases are also
-	  available.)
+	  "country", "city", "asnum", "isp", and "domain".
 	</para>
 	<para>
 	  Some example GeoIP ACLs:
diff --git a/doc/arm/notes.xml b/doc/arm/notes.xml
index a1ce3fcad5..d9ab62be43 100644
--- a/doc/arm/notes.xml
+++ b/doc/arm/notes.xml
@@ -118,11 +118,7 @@
 	  The GeoIP2 API from MaxMind is now supported. Geolocation support
 	  will be compiled in by default if the <command>libmaxminddb</command>
 	  library is found at compile time, but can be turned off by using
-	  <command>configure --without-geoip2</command>, or by using
-	  <command>configure --with-geoip</command>, which will cause
-	  the legacy GeoIP API to be used instead.  (Note that the
-	  databases for the legacy API are no longer maintained by
-	  MaxMind.)
+	  <command>configure --without-geoip2</command>.
 	</para>
 	<para>
 	  The default path to the GeoIP2 databases will be set based
@@ -141,7 +137,7 @@
 	  types are <command>country</command>, <command>city</command>,
 	  <command>domain</command>, <command>isp</command>, and
 	  <command>as</command>. All of these databases support both IPv4
-	  and IPv6 lookups. [GL #182]
+	  and IPv6 lookups. [GL #182] [GL #1112]
 	</para>
       </listitem>
       <listitem>