diff --git a/ChangeLog b/ChangeLog
index 9b0bc78dbd..14072123ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-02-21  Patsy Griffin Franklin  <pfrankli@redhat.com>
+
+        [BZ #21915]
+        * nss/tst-nss-files-hosts-long.root/etc/host.conf: New file.
+
 2019-02-21  Gabriel F. T. Gomes  <gabriel@inconstante.eti.br>
 
 	* argp/argp-help.c (__argp_error_internal): New function,
diff --git a/nss/tst-nss-files-hosts-long.root/etc/host.conf b/nss/tst-nss-files-hosts-long.root/etc/host.conf
new file mode 100644
index 0000000000..d1a59f73a9
--- /dev/null
+++ b/nss/tst-nss-files-hosts-long.root/etc/host.conf
@@ -0,0 +1 @@
+multi on