diff --git a/CHANGES b/CHANGES
index 98c50b7553..a9b9df7816 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+5019.	[cleanup]	A message is now logged when ixfr-from-differences is
+			set at zone level for an inline-signed zone. [GL #470]
+
 5018.	[bug]		Fix incorrect sizeof arguments in lib/isc/pk11.c.
 			[GL !588]
 
diff --git a/bin/named/server.c b/bin/named/server.c
index 9f88a4088a..e3da808bbb 100644
--- a/bin/named/server.c
+++ b/bin/named/server.c
@@ -5304,6 +5304,7 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
 	const cfg_obj_t *typeobj = NULL;
 	const cfg_obj_t *forwarders = NULL;
 	const cfg_obj_t *forwardtype = NULL;
+	const cfg_obj_t *ixfrfromdiffs = NULL;
 	const cfg_obj_t *only = NULL;
 	const cfg_obj_t *signing = NULL;
 	const cfg_obj_t *viewobj = NULL;
@@ -5657,6 +5658,15 @@ configure_zone(const cfg_obj_t *config, const cfg_obj_t *zconfig,
 			dns_zone_setstats(raw, ns_g_server->zonestats);
 			CHECK(dns_zone_link(zone, raw));
 		}
+		if (cfg_map_get(zoptions, "ixfr-from-differences",
+				&ixfrfromdiffs) == ISC_R_SUCCESS)
+		{
+			isc_log_write(ns_g_lctx, NS_LOGCATEGORY_GENERAL,
+				      NS_LOGMODULE_SERVER, ISC_LOG_INFO,
+				      "zone '%s': 'ixfr-from-differences' is "
+				      "ignored for inline-signed zones",
+				      zname);
+		}
 	}
 
 	/*
diff --git a/doc/arm/Bv9ARM-book.xml b/doc/arm/Bv9ARM-book.xml
index 3ecdc046d0..884b855001 100644
--- a/doc/arm/Bv9ARM-book.xml
+++ b/doc/arm/Bv9ARM-book.xml
@@ -6608,6 +6608,11 @@ options {
 		  <command>slave</command> zones respectively.
 		  It is off by default.
 		</para>
+		<para>
+		  Note: if inline signing is enabled for a zone, the
+		  user-provided <command>ixfr-from-differences</command>
+		  setting is ignored for that zone.
+		</para>
 	      </listitem>
 	    </varlistentry>