diff --git a/common/common.c b/common/common.c
index 8e20c9607c..987da9ce6d 100644
--- a/common/common.c
+++ b/common/common.c
@@ -2248,7 +2248,7 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
 	 */
 	DIR *dp;
 	struct dirent *dirp;
-	char *libname_path = NULL;
+	char *libname_path = NULL, *libname_alias = NULL;
 	char current_test_path[LARGEBUF];
 
 	memset(current_test_path, 0, LARGEBUF);
@@ -2278,9 +2278,15 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
 
 		upsdebugx(5,"Comparing lib %s with dirpath entry %s", base_libname, dirp->d_name);
 		compres = strncmp(dirp->d_name, base_libname, base_libname_length);
-		if (compres == 0
-		&&  dirp->d_name[base_libname_length] == '\0' /* avoid "*.dll.a" etc. */
-		) {
+		if (compres == 0) {
+			/* avoid "*.dll.a", ".so.1.2.3" etc. */
+			if (dirp->d_name[base_libname_length] != '\0') {
+				if (!libname_alias) {
+					libname_alias = xstrdup(dirp->d_name);
+				}
+				continue;
+			}
+
 			snprintf(current_test_path, LARGEBUF, "%s/%s", dirname, dirp->d_name);
 #if HAVE_DECL_REALPATH
 			libname_path = realpath(current_test_path, NULL);
@@ -2332,6 +2338,17 @@ static char * get_libname_in_dir(const char* base_libname, size_t base_libname_l
 
 	closedir(dp);
 
+	if (libname_alias) {
+		if (!libname_path) {
+			upsdebugx(1, "Got no strong candidate path for lib %s in %s"
+				", but saw seemingly related names (are you missing"
+				" a symbolic link, perhaps?) e.g.: %s",
+				base_libname, dirname, libname_alias);
+		}
+
+		free(libname_alias);
+	}
+
 	return libname_path;
 }
 
diff --git a/conf/Makefile.am b/conf/Makefile.am
index 873d288324..fd384eebbc 100644
--- a/conf/Makefile.am
+++ b/conf/Makefile.am
@@ -22,7 +22,7 @@ SPELLCHECK_SRC = $(dist_sysconf_DATA) \
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/data/Makefile.am b/data/Makefile.am
index 5fba2e442b..29c440bac2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = evolution500.seq epdu-managed.dev
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/data/html/Makefile.am b/data/html/Makefile.am
index 19436e12da..1327c724b9 100644
--- a/data/html/Makefile.am
+++ b/data/html/Makefile.am
@@ -12,7 +12,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/docs/config-prereqs.txt b/docs/config-prereqs.txt
index b9f87bf8ef..1d8eacc591 100644
--- a/docs/config-prereqs.txt
+++ b/docs/config-prereqs.txt
@@ -21,9 +21,27 @@ Some of the below are alternatives, e.g. compiler toolkits (gcc vs. clang)
 or SSL implementations (OpenSSL vs Mozilla NSS) -- no problem installing
 both, at a disk space cost.
 
-NOTE: Some NUT branches may need additional or different software versions
+[NOTE]
+======
+Some NUT branches may need additional or different software versions
 that are not yet included into `master` branch dependencies, e.g. the DMF
-(Dynamic Mapping Files) sub-project needs LUA 5.1.
+(Dynamic Mapping Files) sub-project needs LUA 5.1 for build and run-time,
+and some Python modules for build, e.g. using OS packaging or custom call
+to `pip install pycparser`.
+
+In case your system still provides a Python 2.x environment (and for some
+reason you want to use it instead of Python 3.x), but does not anymore
+provide a `pip` nor `pycparser` packages for it, you may need to use an
+external bootstrap first, e.g.:
+
+------
+# Fetch get-pip.py for python 2.7
+:; curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
+:; python2 get-pip.py
+:; python2 -m pip --version
+:; python2 -m pip install pycparser
+------
+======
 
 More packages and/or system setup may be needed to actually run NUT with
 all features enabled; chapters below concern just with building it.
@@ -825,10 +843,17 @@ default site.
     openssl nss \
     augeas \
     libusb1 \
-    neon \
     net-snmp \
     avahi
 
+# For netxml-ups driver the library should suffice; however for nut-scanner
+# you may currently require to add a `libneon.so` symlink (the package seems
+# to only deliver a numbered SO library name), e.g.:
+:; pkg_add neon && \
+   if ! test -s /usr/local/lib/libneon.so ; then
+    ln -s "`cd /usr/local/lib && ls -1 libneon.so.* | sort -n | tail -1`" /usr/local/lib/libneon.so
+   fi
+
 # Select a LUA-5.1 (or possibly 5.2?) version
 :; pkg_add \
     lua
diff --git a/docs/man/Makefile.am b/docs/man/Makefile.am
index 2931bc5252..2f096b7889 100644
--- a/docs/man/Makefile.am
+++ b/docs/man/Makefile.am
@@ -1123,7 +1123,7 @@ endif !HAVE_ASCIIDOC
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/drivers/hidparser.h b/drivers/hidparser.h
index 07b9f267aa..9f604565e5 100644
--- a/drivers/hidparser.h
+++ b/drivers/hidparser.h
@@ -32,7 +32,14 @@ extern "C" {
 /* *INDENT-ON* */
 #endif /* __cplusplus */
 
-#include "config.h"
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
+
 #include "hidtypes.h"
 
 /* Include "usb-common.h" or "libshut.h" as appropriate, to define the 
diff --git a/drivers/libhid.h b/drivers/libhid.h
index 613fda9aae..52feeb2601 100644
--- a/drivers/libhid.h
+++ b/drivers/libhid.h
@@ -29,7 +29,13 @@
 #ifndef NUT_LIBHID_H_SEEN
 #define NUT_LIBHID_H_SEEN
 
-#include "config.h"
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 #include <sys/types.h>
 #include "nut_stdint.h"
diff --git a/drivers/nutdrv_qx.h b/drivers/nutdrv_qx.h
index 0c5f20688a..faffe717cc 100644
--- a/drivers/nutdrv_qx.h
+++ b/drivers/nutdrv_qx.h
@@ -26,11 +26,18 @@
 #ifndef NUTDRV_QX_H
 #define NUTDRV_QX_H
 
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "config.h"
 
 /* For testing purposes */
 /*#define TESTING*/
diff --git a/drivers/serial.h b/drivers/serial.h
index 7987cb385d..cd8aa0fbe4 100644
--- a/drivers/serial.h
+++ b/drivers/serial.h
@@ -1,7 +1,13 @@
 #ifndef SERIAL_H_SEEN
 #define SERIAL_H_SEEN 1
 
-#include "config.h"	/* should be first */
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 #include "attribute.h"
 
diff --git a/drivers/snmp-ups.h b/drivers/snmp-ups.h
index 83a3a25b98..fa6e495448 100644
--- a/drivers/snmp-ups.h
+++ b/drivers/snmp-ups.h
@@ -52,6 +52,14 @@
 #ifndef SNMP_UPS_H
 #define SNMP_UPS_H
 
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
+
 #include "nut_stdint.h"	/* uint32_t */
 
 /* FIXME: still needed?
diff --git a/drivers/usb-common.h b/drivers/usb-common.h
index 4f151ee8ac..ba75091f75 100644
--- a/drivers/usb-common.h
+++ b/drivers/usb-common.h
@@ -57,7 +57,13 @@
 #ifndef NUT_USB_COMMON_H
 #define NUT_USB_COMMON_H
 
-#include "config.h"	/* be sure to know all about the system config */
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 /* Note: usb-common.h (this file) is included by nut_libusb.h,
  * so not looping the includes ;)
diff --git a/drivers/usbhid-ups.h b/drivers/usbhid-ups.h
index 2e8a3fcedd..679ea7de7c 100644
--- a/drivers/usbhid-ups.h
+++ b/drivers/usbhid-ups.h
@@ -26,11 +26,19 @@
 #ifndef USBHID_UPS_H
 #define USBHID_UPS_H
 
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include "config.h"
+
 #include "libhid.h"
 
 extern hid_dev_handle_t	udev;
diff --git a/include/common.h b/include/common.h
index 407b8425aa..db1168b80d 100644
--- a/include/common.h
+++ b/include/common.h
@@ -20,7 +20,13 @@
 #ifndef NUT_COMMON_H_SEEN
 #define NUT_COMMON_H_SEEN 1
 
-#include "config.h"		/* must be the first header */
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 #ifdef WIN32
 # ifndef __POSIX_VISIBLE
diff --git a/include/nut_float.h b/include/nut_float.h
index 290edb4909..0b89974b62 100644
--- a/include/nut_float.h
+++ b/include/nut_float.h
@@ -22,7 +22,13 @@
 #ifndef NUT_FLOAT_H_SEEN
 #define NUT_FLOAT_H_SEEN 1
 
-#include "config.h"
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 #if defined HAVE_FLOAT_H
 #  include <float.h>
diff --git a/include/nut_stdint.h b/include/nut_stdint.h
index 5f173191ae..9d64a061b4 100644
--- a/include/nut_stdint.h
+++ b/include/nut_stdint.h
@@ -21,7 +21,13 @@
 #ifndef NUT_STDINT_H_SEEN
 #define NUT_STDINT_H_SEEN 1
 
-#include "config.h"
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 #ifndef __STDC_LIMIT_MACROS
 #define __STDC_LIMIT_MACROS 1
diff --git a/include/proto.h b/include/proto.h
index f88dd61f1c..68c251a118 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -24,7 +24,13 @@
 #ifndef NUT_PROTO_H_SEEN
 #define NUT_PROTO_H_SEEN 1
 
-#include "config.h"
+/* "config.h" is generated by autotools and lacks a header guard, so
+ * we use an unambiguously named macro we know we must have, as one.
+ * It must be the first header: be sure to know all about system config.
+ */
+#ifndef NUT_NETVERSION
+# include "config.h"
+#endif
 
 #include "attribute.h"
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index f0f59aa877..225c10f015 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -35,7 +35,7 @@ SPELLCHECK_SRC = README.adoc RedHat/README.adoc usb_resetter/README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/Solaris/Makefile.am b/scripts/Solaris/Makefile.am
index 3f01ec6034..e142a02f4d 100644
--- a/scripts/Solaris/Makefile.am
+++ b/scripts/Solaris/Makefile.am
@@ -96,7 +96,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/Windows/Makefile.am b/scripts/Windows/Makefile.am
index 52e4d927f8..abbfd32a37 100644
--- a/scripts/Windows/Makefile.am
+++ b/scripts/Windows/Makefile.am
@@ -77,7 +77,7 @@ SPELLCHECK_SRC = README.adoc DriverInstaller/README.adoc Installer/README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/devd/Makefile.am b/scripts/devd/Makefile.am
index e3a9967c2b..b9d9401ad3 100644
--- a/scripts/devd/Makefile.am
+++ b/scripts/devd/Makefile.am
@@ -36,7 +36,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/hotplug/Makefile.am b/scripts/hotplug/Makefile.am
index 8888492885..5fa7809f86 100644
--- a/scripts/hotplug/Makefile.am
+++ b/scripts/hotplug/Makefile.am
@@ -28,7 +28,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/installer/Makefile.am b/scripts/installer/Makefile.am
index ae236cf88b..10a67121cb 100644
--- a/scripts/installer/Makefile.am
+++ b/scripts/installer/Makefile.am
@@ -35,7 +35,7 @@ SPELLCHECK_SRC = README.adoc common/README_ipp-os-shutdown.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/python/Makefile.am b/scripts/python/Makefile.am
index 56eeaa97f4..0b83249cd5 100644
--- a/scripts/python/Makefile.am
+++ b/scripts/python/Makefile.am
@@ -199,7 +199,7 @@ SPELLCHECK_SRC = \
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/systemd/Makefile.am b/scripts/systemd/Makefile.am
index 7a0f37f7b9..9b19fcee54 100644
--- a/scripts/systemd/Makefile.am
+++ b/scripts/systemd/Makefile.am
@@ -44,7 +44,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/udev/Makefile.am b/scripts/udev/Makefile.am
index e0576d952c..7a6e13fcd6 100644
--- a/scripts/udev/Makefile.am
+++ b/scripts/udev/Makefile.am
@@ -41,7 +41,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFILE) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/scripts/upsdrvsvcctl/Makefile.am b/scripts/upsdrvsvcctl/Makefile.am
index 4cb4ad69d2..03adf8e1c4 100644
--- a/scripts/upsdrvsvcctl/Makefile.am
+++ b/scripts/upsdrvsvcctl/Makefile.am
@@ -17,7 +17,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@
 
diff --git a/tests/NIT/Makefile.am b/tests/NIT/Makefile.am
index 086519757e..f251fa7b1f 100644
--- a/tests/NIT/Makefile.am
+++ b/tests/NIT/Makefile.am
@@ -36,7 +36,7 @@ SPELLCHECK_SRC = README.adoc
 # NOTE: Due to portability, we do not use a GNU percent-wildcard extension.
 # We also have to export some variables that may be tainted by relative
 # paths when parsing the other makefile (e.g. MKDIR_P that may be defined
-# via expanded $(top_builddir)/install_sh):
+# via expanded $(top_builddir)/install-sh):
 #%-spellchecked: % Makefile.am $(top_srcdir)/docs/Makefile.am $(abs_srcdir)/$(NUT_SPELL_DICT)
 #	+$(MAKE) -s -f $(top_builddir)/docs/Makefile $(AM_MAKEFLAGS) MKDIR_P="$(MKDIR_P)" builddir="$(builddir)" srcdir="$(srcdir)" top_builddir="$(top_builddir)" top_srcdir="$(top_srcdir)" SPELLCHECK_SRC_ONE="$<" SPELLCHECK_SRCDIR="$(srcdir)" SPELLCHECK_BUILDDIR="$(builddir)" $@