diff --git a/AUTHORS b/AUTHORS
index c25b3bb6ad0..116dfe9a2a6 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -59,6 +59,7 @@ Keisuke Fukuda <kfukuda@preferred.jp>
 Ken Raffenetti <raffenet@mcs.anl.gov>
 Khaled Hamidouche <Khaled.Hamidouche@amd.com>
 Konstantin Belousov <kib@freebsd.org>
+Laurin Martins <laurin.martins@outlook.de>
 Leonid Genkin <lgenkin@nvidia.com>
 Lior Paz <liorpa@nvidia.com>
 Luis E. Pena <l31g@hotmail.com>
diff --git a/contrib/configure-devel b/contrib/configure-devel
index 678fb78ac1f..b2ca68c5a87 100755
--- a/contrib/configure-devel
+++ b/contrib/configure-devel
@@ -11,7 +11,7 @@
 #
 
 basedir=$(cd $(dirname $0) && pwd)
-$basedir/../configure \
+"$basedir/../configure" \
 	--enable-gtest \
 	--enable-examples \
 	--enable-test-apps \
diff --git a/contrib/configure-opt b/contrib/configure-opt
index dd7aeec2f4a..28718dbcde0 100755
--- a/contrib/configure-opt
+++ b/contrib/configure-opt
@@ -11,6 +11,6 @@
 #
 
 basedir=$(cd $(dirname $0) && pwd)
-$basedir/configure-release \
+"$basedir/configure-release" \
 	--enable-optimizations \
 	"$@"
diff --git a/contrib/configure-prof b/contrib/configure-prof
index 61f2f2c0f84..1f3bc643259 100755
--- a/contrib/configure-prof
+++ b/contrib/configure-prof
@@ -11,7 +11,7 @@
 #
 
 basedir=$(cd $(dirname $0) && pwd)
-$basedir/../configure \
+"$basedir/../configure" \
 	--disable-logging \
 	--disable-debug \
 	--disable-assertions \
diff --git a/contrib/configure-release b/contrib/configure-release
index f2fe6de6ff3..35e76754e2f 100755
--- a/contrib/configure-release
+++ b/contrib/configure-release
@@ -11,7 +11,7 @@
 #
 
 basedir=$(cd $(dirname $0) && pwd)
-$basedir/../configure \
+"$basedir/../configure" \
 	--disable-logging \
 	--disable-debug \
 	--disable-assertions \
diff --git a/contrib/configure-release-mt b/contrib/configure-release-mt
index d57a96b1ebe..f2bef299b7d 100755
--- a/contrib/configure-release-mt
+++ b/contrib/configure-release-mt
@@ -11,6 +11,6 @@
 #
 
 basedir=$(cd $(dirname $0) && pwd)
-$basedir/../contrib/configure-release \
+"$basedir/../contrib/configure-release" \
 	--enable-mt \
 	"$@"