diff --git a/Makefile.in b/Makefile.in
index 482f14f..4373086 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -150,6 +150,10 @@ else
 CXXLIB+=-lstdc++
 endif
 
+ifeq ("@STATIC@", "yes")
+LDFLAGS+=-static
+endif
+
 INSTALL:=@INSTALL@
 PREFIX:=@prefix@
 BINDIR:=$(DESTDIR)$(PREFIX)/sbin
diff --git a/configure.ac b/configure.ac
index 9b0b2ce..efca586 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,6 +153,14 @@ AC_ARG_ENABLE(static_cxx,
               STATIC_CXX=$enableval, STATIC_CXX=no)
 AC_MSG_RESULT($STATIC_CXX)
 
+################################################################################
+dnl -- Enable static linking.
+AC_MSG_CHECKING(whether to statically link)
+AC_ARG_ENABLE(static,
+              AC_HELP_STRING(--enable-static, [enable static link]),
+              STATIC=$enableval, STATIC=no)
+AC_MSG_RESULT($STATIC)
+
 ################################################################################
 dnl -- Check for getopt
 AC_CHECK_HEADERS(getopt.h, AC_DEFINE([HAVE_GETOPTLONG], 1, [Define to 1 if getopt_long is available.]))
@@ -182,6 +190,7 @@ AC_SUBST(TESTING)
 AC_SUBST(THIN_PROVISIONING_TOOLS_VERSION)
 AC_SUBST(STATIC_CXX)
 AC_SUBST(DEVTOOLS)
+AC_SUBST(STATIC)
 
 ################################################################################
 dnl -- First and last lines should not contain files to generate in order to