diff --git a/odfstudio/CustomTarget_odfstudio_enabled.mk b/odfstudio/CustomTarget_odfstudio_enabled.mk
new file mode 100644
index 000000000000..c899c0989f31
--- /dev/null
+++ b/odfstudio/CustomTarget_odfstudio_enabled.mk
@@ -0,0 +1,6 @@
+$(eval $(call gb_CustomTarget_CustomTarget,odfstudio/enabled))
+
+$(call gb_CustomTarget_get_target,odfstudio/enabled):
+	@echo "ODFStudio build enabled"
+	@mkdir -p $(dir $@)
+	@touch $@
diff --git a/odfstudio/CustomTarget_smoketest.mk b/odfstudio/CustomTarget_smoketest.mk
deleted file mode 100644
index b4984edfa2a5..000000000000
--- a/odfstudio/CustomTarget_smoketest.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-$(eval $(call gb_CustomTarget_CustomTarget,odfstudio/smoketest))
-
-$(call gb_CustomTarget_get_target,odfstudio/smoketest):
-	@echo "ODFStudio: optional build target enabled"
-	@mkdir -p $(dir $@)
-	@touch $@
diff --git a/odfstudio/Module_odfstudio.mk b/odfstudio/Module_odfstudio.mk
index 796ab637dd49..7745c688536e 100644
--- a/odfstudio/Module_odfstudio.mk
+++ b/odfstudio/Module_odfstudio.mk
@@ -1,7 +1,5 @@
-# ODF Studio - experimental / pedagogical module
-
 $(eval $(call gb_Module_Module,odfstudio))
 
 $(eval $(call gb_Module_add_targets,odfstudio,\
-    CustomTarget_smoketest \
+    CustomTarget_odfstudio_enabled \
 ))