diff --git a/ChangeLog b/ChangeLog
index 711eb4fd08..78d1338443 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-01-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+	[BZ #22701]
+	* nis/Makefile (libnsl-inhibit-o) [$(build-obsolete-nsl) != yes]:
+	Build only shared objects.
+
 2018-01-26  Carlos O'Donell  <carlos@redhat.com>
 
 	* README: Update for hppa.
diff --git a/nis/Makefile b/nis/Makefile
index 01ec4dc357..e7497f7242 100644
--- a/nis/Makefile
+++ b/nis/Makefile
@@ -74,7 +74,8 @@ else # not $(build-obsolete-nsl)
 # is not installed.
 install-lib-ldscripts = libnsl.so
 $(inst_libdir)/libnsl.so:
-libnsl-inhibit-o = .o # Build no static libnsl.a.
+# Build only shared libnsl.
+libnsl-inhibit-o = $(filter-out .os,$(object-suffixes))
 
 endif # not $(build-obsolete-nsl)