diff --git a/ChangeLog b/ChangeLog
index 13fced965..5af9c04ce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2014-06-30  Yavor Doganov  <yavor@gnu.org>
+
+	* Tools/GNUmakefile (CONFIG_SYSTEM_LIBS):
+	* Tools/make_strings/GNUmakefile (CONFIG_SYSTEM_LIBS): Define
+	to the empty string to avoid linking the tools against
+	external libraries.
+	
 2014-07-13 Yavor Doganov  <yavor@gnu.org>
 
 	* base.make.in: make base dependencies explicit only when statically
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index d62a6f97b..45bf531dd 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -103,6 +103,10 @@ locale_alias_OBJC_FILES = locale_alias.m
 xmlparse_OBJC_FILES = xmlparse.m
 HTMLLinker_OBJC_FILES = HTMLLinker.m
 
+# Reset this variable (defined in config.mak) to avoid useless linkage
+# against the libraries gnustep-base uses.
+CONFIG_SYSTEM_LIBS :=
+
 DOCUMENT_NAME = autogsdoc
 
 # Documentation rules for autogsdoc
diff --git a/Tools/make_strings/GNUmakefile b/Tools/make_strings/GNUmakefile
index 353773d95..60b5f7d10 100644
--- a/Tools/make_strings/GNUmakefile
+++ b/Tools/make_strings/GNUmakefile
@@ -37,6 +37,8 @@ make_strings_OBJC_FILES = \
 	StringsEntry.m \
 	StringsFile.m
 
+CONFIG_SYSTEM_LIBS :=
+
 include GNUmakefile.preamble
 
 include $(GNUSTEP_MAKEFILES)/tool.make