diff --git a/ChangeLog b/ChangeLog
index 59bad2a0f..13fced965 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-07-13 Yavor Doganov  <yavor@gnu.org>
+
+	* base.make.in: make base dependencies explicit only when statically
+	linnking (bug #42423)
+
 2014-06-30 Yavor Doganov  <yavor@gnu.org>
 
 	* GNUmakefile: Use -include for deb.make (for backward compatibility
diff --git a/base.make.in b/base.make.in
index a1cbc00bb..2a9575eaa 100644
--- a/base.make.in
+++ b/base.make.in
@@ -29,9 +29,11 @@ ifeq ($(BASE_MAKE_LOADED),)
     #
     AUXILIARY_OBJCFLAGS += @NX_CONST_STRING_OBJCFLAGS@
 
-    CONFIG_SYSTEM_LIBS += @LIBS@
-    CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
-    CONFIG_SYSTEM_INCL += @CPPFLAGS@
+    ifeq ($(shared),no)
+      CONFIG_SYSTEM_LIBS += @LIBS@
+      CONFIG_SYSTEM_LIB_DIR += @LDIR_FLAGS@
+      CONFIG_SYSTEM_INCL += @CPPFLAGS@
+    endif
 
     GNUSTEP_BASE_VERSION = @VERSION@
     GNUSTEP_BASE_MAJOR_VERSION = @MAJOR_VERSION@