diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 1cc9c753123c..edaf6bfde87e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -847,5 +847,19 @@ endef
 
 endif # SYSTEM_SAXON
 
+ifeq ($(SYSTEM_BSH),YES)
+
+define gb_JavaClassSet__use_bsh
+$(call gb_JavaClassSet_add_system_jar,$(1),$(BSH_JAR))
+endef
+
+else # !SYSTEM_BSH
+
+define gb_JavaClassSet__use_bsh
+$(call gb_JavaClassSet_add_jar,$(1),$(OUTDIR)/bin/bsh.jar)
+endef
+
+endif # SYSTEM_BSH
+
 
 # vim: set noet sw=4 ts=4:
diff --git a/scripting/Jar_ScriptProviderForBeanShell.mk b/scripting/Jar_ScriptProviderForBeanShell.mk
index 87e2cb933a50..e81f5b0c0827 100644
--- a/scripting/Jar_ScriptProviderForBeanShell.mk
+++ b/scripting/Jar_ScriptProviderForBeanShell.mk
@@ -34,7 +34,10 @@ $(eval $(call gb_Jar_add_jars,ScriptProviderForBeanShell,\
 	$(OUTDIR)/bin/ridl.jar \
 	$(OUTDIR)/bin/unoil.jar \
 	$(OUTDIR)/bin/ScriptFramework.jar \
-	$(OUTDIR)/bin/bsh.jar \
+))
+
+$(eval $(call gb_Jar_use_externals,ScriptProviderForBeanShell,\
+	bsh \
 ))
 
 $(eval $(call gb_Jar_set_packageroot,ScriptProviderForBeanShell,com))