diff --git a/config.mk b/config.mk
index a1699050..7375c90d 100644
--- a/config.mk
+++ b/config.mk
@@ -80,6 +80,9 @@ WITH_DOCS:=yes
 # Build with client support for SOCK5 proxy.
 WITH_SOCKS:=yes
 
+# Build static libraries
+WITH_STATIC_LIBRARIES:=yes
+
 # =============================================================================
 # End of user configuration
 # =============================================================================
diff --git a/lib/Makefile b/lib/Makefile
index d2d6643c..373a0b50 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -3,15 +3,23 @@ include objects.mk
 
 .PHONY : really clean install
 
-all : libmosquitto.so.${SOVERSION} libmosquitto.a
+ALL_DEPS=libmosquitto.so.${SOVERSION}
+
+ifeq ($(WITH_STATIC_LIBRARIES),yes)
+	ALL_DEPS+=libmosquitto.a
+endif
+
+all : ${ALL_DEPS}
 	$(MAKE) -C cpp
 
 install : all
 	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
 	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so.${SOVERSION}
 	ln -sf libmosquitto.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.so
+ifeq ($(WITH_STATIC_LIBRARIES),yes)
 	$(INSTALL) libmosquitto.a ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.a
 	${CROSS_COMPILE}${STRIP} -g --strip-unneeded ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquitto.a
+endif
 	$(INSTALL) -d ${DESTDIR}${prefix}/include/
 	$(INSTALL) mosquitto.h ${DESTDIR}${prefix}/include/mosquitto.h
 	$(MAKE) -C cpp install
diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile
index c8ce0050..cf0df7a8 100644
--- a/lib/cpp/Makefile
+++ b/lib/cpp/Makefile
@@ -7,14 +7,22 @@ endif
 
 .PHONY : clean install
 
-all : libmosquittopp.so.${SOVERSION} libmosquittopp.a
+ALL_DEPS=libmosquittopp.so.${SOVERSION}
+
+ifeq ($(WITH_STATIC_LIBRARIES),yes)
+    ALL_DEPS+=libmosquittopp.a
+endif
+
+all : ${ALL_DEPS}
 
 install : all
 	$(INSTALL) -d ${DESTDIR}$(prefix)/lib${LIB_SUFFIX}/
 	$(INSTALL) -s --strip-program=${CROSS_COMPILE}${STRIP} libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so.${SOVERSION}
 	ln -sf libmosquittopp.so.${SOVERSION} ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.so
+ifeq ($(WITH_STATIC_LIBRARIES),yes)
 	$(INSTALL) libmosquittopp.a ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.a
 	${CROSS_COMPILE}${STRIP} -g --strip-unneeded ${DESTDIR}${prefix}/lib${LIB_SUFFIX}/libmosquittopp.a
+endif
 	$(INSTALL) -d ${DESTDIR}${prefix}/include/
 	$(INSTALL) mosquittopp.h ${DESTDIR}${prefix}/include/mosquittopp.h