diff --git a/WHATS_NEW b/WHATS_NEW
index 19ba5a949..eb86a3098 100644
--- a/WHATS_NEW
+++ b/WHATS_NEW
@@ -1,5 +1,6 @@
 Version 2.02.46 - 
 ================================
+  Avoid creating some static libraries without static_link
   Enable use of cached metadata for pvs and pvdisplay commands.
   Add missing 'device-mapper' internal subdir build dependency.
   Fix memory leak in mirror allocation code.
diff --git a/daemons/dmeventd/Makefile.in b/daemons/dmeventd/Makefile.in
index 2da086c65..2878cf264 100644
--- a/daemons/dmeventd/Makefile.in
+++ b/daemons/dmeventd/Makefile.in
@@ -17,7 +17,9 @@ VPATH = @srcdir@
 
 SOURCES = libdevmapper-event.c
 
+ifeq ("@STATIC_LINK@", "yes")
 LIB_STATIC = libdevmapper-event.a
+endif
 LIB_VERSION = $(LIB_VERSION_DM)
 
 ifeq ("@LIB_SUFFIX@","dylib")
@@ -37,7 +39,7 @@ endif
 include $(top_srcdir)/make.tmpl
 
 all: dmeventd
-device-mapper: dmeventd
+device-mapper: dmeventd $(LIB_STATIC)
 
 LDFLAGS += -ldl -ldevmapper -lpthread
 CLDFLAGS += -ldl -ldevmapper -lpthread
diff --git a/libdm/Makefile.in b/libdm/Makefile.in
index 5283717d0..4874ff1c7 100644
--- a/libdm/Makefile.in
+++ b/libdm/Makefile.in
@@ -34,7 +34,9 @@ SOURCES =\
 
 INCLUDES = -I$(interface) -I.
 
+ifeq ("@STATIC_LINK@", "yes")
 LIB_STATIC = $(interface)/libdevmapper.a
+endif
 
 ifeq ("@LIB_SUFFIX@","dylib")
   LIB_SHARED = $(interface)/libdevmapper.dylib
diff --git a/liblvm/Makefile.in b/liblvm/Makefile.in
index ffdd7b5f1..3ab4950f1 100644
--- a/liblvm/Makefile.in
+++ b/liblvm/Makefile.in
@@ -23,7 +23,9 @@ LIB_NAME = liblvm
 LIB_VERSION = $(LIB_VERSION_LVM)
 VERSIONED_SHLIB = $(LIB_NAME).$(LIB_SUFFIX).$(LIB_VERSION_LVM)
 
+ifeq ("@STATIC_LINK@", "yes")
 LIB_STATIC = $(LIB_NAME).a
+endif
 LIB_SHARED = $(LIB_NAME).so
 
 CLEAN_TARGETS += liblvm.cflow