diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 096fbea6bebf..fd653e2e89c5 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3568,6 +3568,7 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 endef
 
 $(eval $(call gb_Helper_register_packages_for_install,ooo,\
+	gpgmepp \
 	libassuan \
 	libgpg-error \
 ))
@@ -3576,10 +3577,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
 	gpgmepp \
 ))
 
-$(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \
-	gpgme-w32spawn \
-))
-
 endif
 
 ifneq ($(filter MACOSX LINUX,$(OS)),)
diff --git a/external/gpgmepp/ExternalPackage_gpgmepp.mk b/external/gpgmepp/ExternalPackage_gpgmepp.mk
index f8d19f39a067..6bab3e5e293f 100644
--- a/external/gpgmepp/ExternalPackage_gpgmepp.mk
+++ b/external/gpgmepp/ExternalPackage_gpgmepp.mk
@@ -27,9 +27,6 @@ else ifeq ($(OS),WNT)
 
 $(eval $(call gb_ExternalPackage_add_file,gpgmepp,$(LIBO_LIB_FOLDER)/gpgme-w32spawn.exe,src/gpgme-w32spawn.exe))
 
-$(call gb_Package_get_target_for_build,gpgmepp):
-	cp $(call gb_UnpackedTarball_get_dir,gpgmepp)/src/gpgme-w32spawn.exe $(call gb_Executable__get_dir_for_exe,cppunittester)/gpgme-w32spawn.exe
-
 endif
 
 # If a tool executed during the build (like svidl) requires these gpgmepp libraries, it will also