diff --git a/ChangeLog b/ChangeLog
index 029af609e9..020a24a52a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1998-06-16  Ulrich Drepper  <drepper@cygnus.com>
+
+	* string/Makefile: Make sure test-ffs does not use builtins.
+
 1998-06-16  Thorsten Kukuk  <kukuk@vt.uni-paderborn.de>
 
 	* sunrpc/svc.c: Check for NULL pointer.
diff --git a/nis/Banner b/nis/Banner
index 0937be7419..478c9b996e 100644
--- a/nis/Banner
+++ b/nis/Banner
@@ -1 +1 @@
-NIS(YP)/NIS+ NSS modules 0.16 by Thorsten Kukuk
+NIS(YP)/NIS+ NSS modules 0.17 by Thorsten Kukuk
diff --git a/string/Makefile b/string/Makefile
index eda9242ab7..9de1111f55 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -54,6 +54,7 @@ noinl-tester-ENV = LANGUAGE=C
 CFLAGS-noinl-tester.c = -fno-builtin
 CFLAGS-tst-strlen.c = -fno-builtin
 CFLAGS-stratcliff.c = -fno-builtin
+CFLAGS-test-ffs.c = -fno-builtin
 
 ifeq ($(cross-compiling),no)
 tests: $(objpfx)tst-svc.out