diff --git a/connectivity/Module_connectivity.mk b/connectivity/Module_connectivity.mk
index aee317867501..e7043a77613e 100644
--- a/connectivity/Module_connectivity.mk
+++ b/connectivity/Module_connectivity.mk
@@ -10,6 +10,12 @@
 
 $(eval $(call gb_Module_Module,connectivity))
 
+$(eval $(call gb_Module_add_targets,connectivity,\
+	Library_dbtools \
+))
+
+ifneq (,$(filter DBCONNECTIVITY,$(BUILD_TYPE)))
+
 $(eval $(call gb_Module_add_targets,connectivity,\
 	Configuration_calc \
 	Configuration_dbase \
@@ -19,7 +25,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
 	Library_calc \
 	Library_dbase \
 	Library_dbpool2 \
-	Library_dbtools \
 	Library_file \
 	Library_flat \
 	Library_mysql \
@@ -132,4 +137,6 @@ $(eval $(call gb_Module_add_check_targets,connectivity,\
 	CppunitTest_connectivity_commontools \
 ))
 
+endif
+
 # vim: set noet sw=4 ts=4: