--- a/clients/tools/Makefile.in
+++ b/clients/tools/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= ldapsearch.c ldapmodify.c ldapdelete.c ldapmodrdn.c \
 		ldappasswd.c ldapwhoami.c ldapvc.c ldapcompare.c \
 		ldapexop.c ldapurl.c common.c
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 LIBRARY = liblber.la
 
 NT_SRCS = nt_err.c
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 LIBRARY = libldap.la
 
 PROGRAMS = apitest dntest ftest ltest urltest testavl
--- a/libraries/liblunicode/Makefile.in
+++ b/libraries/liblunicode/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 LIBRARY = liblunicode.a
 
 XXDIR = $(srcdir)/ucdata/
--- a/libraries/liblutil/Makefile.in
+++ b/libraries/liblutil/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 LIBRARY	= liblutil.a
 
 LDAP_INCDIR= ../../include       
--- a/libraries/librewrite/Makefile.in
+++ b/libraries/librewrite/Makefile.in
@@ -16,6 +16,8 @@
 ## Copyright 2000-2001 Pierangelo Masarati <ando@sys-net.it>
 ##
 
+SHELL = @SHELL@
+
 SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \
 	session.c subst.c var.c xmap.c escapemap.c \
 	parse.c rewrite.c
--- a/libraries/Makefile.in
+++ b/libraries/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SUBDIRS= \
 	liblutil \
 	liblber \
--- a/servers/lloadd/Makefile.in
+++ b/servers/lloadd/Makefile.in
@@ -13,6 +13,7 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
 
 XSRCS	= version.c
 
--- a/servers/slapd/back-asyncmeta/Makefile.in
+++ b/servers/slapd/back-asyncmeta/Makefile.in
@@ -19,6 +19,8 @@
 ## based on back-meta module for inclusion in OpenLDAP Software.
 ## This work was sponsored by Ericsson
 
+SHELL = @SHELL@
+
 SRCS	= init.c config.c search.c message_queue.c bind.c add.c compare.c \
 		delete.c modify.c modrdn.c map.c \
 		conn.c candidates.c dncache.c meta_result.c
--- a/servers/slapd/back-dnssrv/Makefile.in
+++ b/servers/slapd/back-dnssrv/Makefile.in
@@ -18,6 +18,8 @@
 #  The DNSSRV backend was written by Kurt D. Zeilenga.
 #
 
+SHELL = @SHELL@
+
 SRCS	= init.c bind.c search.c config.c referral.c
 OBJS	= init.lo bind.lo search.lo config.lo referral.lo
 
--- a/servers/slapd/back-ldap/Makefile.in
+++ b/servers/slapd/back-ldap/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
 		delete.c modify.c modrdn.c extended.c chain.c \
 		distproc.c monitor.c pbind.c
--- a/servers/slapd/back-ldif/Makefile.in
+++ b/servers/slapd/back-ldif/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = ldif.c
 OBJS = ldif.lo
 
--- a/servers/slapd/back-mdb/Makefile.in
+++ b/servers/slapd/back-mdb/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = init.c tools.c config.c \
 	add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
 	extended.c operational.c \
--- a/servers/slapd/back-meta/Makefile.in
+++ b/servers/slapd/back-meta/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= init.c config.c search.c bind.c unbind.c add.c compare.c \
 		delete.c modify.c modrdn.c suffixmassage.c map.c \
 		conn.c candidates.c dncache.c
--- a/servers/slapd/back-monitor/Makefile.in
+++ b/servers/slapd/back-monitor/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = init.c search.c compare.c modify.c bind.c \
 	operational.c \
 	cache.c entry.c \
--- a/servers/slapd/back-null/Makefile.in
+++ b/servers/slapd/back-null/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = null.c
 OBJS = null.lo
 
--- a/servers/slapd/back-passwd/Makefile.in
+++ b/servers/slapd/back-passwd/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= search.c config.c init.c
 OBJS	= search.lo config.lo init.lo
 
--- a/servers/slapd/back-perl/Makefile.in
+++ b/servers/slapd/back-perl/Makefile.in
@@ -14,6 +14,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= init.c search.c close.c config.c bind.c compare.c \
 		modify.c add.c modrdn.c delete.c
 OBJS	= init.lo search.lo close.lo config.lo bind.lo compare.lo \
--- a/servers/slapd/back-relay/Makefile.in
+++ b/servers/slapd/back-relay/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= init.c op.c
 OBJS	= init.lo op.lo
 
--- a/servers/slapd/back-sock/Makefile.in
+++ b/servers/slapd/back-sock/Makefile.in
@@ -17,6 +17,8 @@
 ## This work was initially developed by Brian Candler for inclusion
 ## in OpenLDAP Software.
 
+SHELL = @SHELL@
+
 SRCS	= init.c config.c opensock.c search.c bind.c unbind.c add.c \
 		delete.c modify.c modrdn.c compare.c result.c extended.c
 OBJS	= init.lo config.lo opensock.lo search.lo bind.lo unbind.lo add.lo \
--- a/servers/slapd/back-sql/Makefile.in
+++ b/servers/slapd/back-sql/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS	= init.c config.c search.c bind.c compare.c operational.c \
 		entry-id.c schema-map.c sql-wrap.c modify.c util.c \
 		add.c delete.c modrdn.c api.c
--- a/servers/slapd/back-wt/Makefile.in
+++ b/servers/slapd/back-wt/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = init.c tools.c config.c \
        add.c bind.c compare.c delete.c modify.c modrdn.c search.c \
        extended.c operational.c \
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SLAPTOOLS=slapadd slapcat slapdn slapindex slapmodify slappasswd slaptest slapauth slapacl slapschema
 PROGRAMS=slapd $(SLAPTOOLS)
 XPROGRAMS=sslapd libbackends.a .backend liboverlays.a
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = overlays.c \
 	accesslog.c \
 	auditlog.c \
--- a/servers/slapd/pwmods/Makefile.in
+++ b/servers/slapd/pwmods/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 SRCS = argon2.c
 
 LTONLY_MOD = $(LTONLY_mod)
--- a/servers/slapd/slapi/Makefile.in
+++ b/servers/slapd/slapi/Makefile.in
@@ -14,6 +14,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 LIBRARY = libslapi.la
 
 #all-common: $(LIBRARY) $(PROGRAMS)
--- a/tests/progs/Makefile.in
+++ b/tests/progs/Makefile.in
@@ -13,6 +13,8 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
+SHELL = @SHELL@
+
 PROGRAMS = slapd-tester slapd-search slapd-read slapd-addel slapd-modrdn \
 		slapd-modify slapd-bind slapd-mtread ldif-filter slapd-watcher