diff --git a/macros.mingw64 b/macros.mingw64
index c04e5cd..b311621 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -64,9 +64,6 @@
    /usr/lib/rpm/mingw64-find-debuginfo.sh %{_builddir} 1\
 %{nil}
 
-# disable default debug package
-%debug_package %{nil}
-
 # Template for debug sub-package.
 %_mingw64_debug_package(n:) \
 %package %{-n:-n %{-n*}-}debug \
@@ -115,7 +112,9 @@ package or when debugging this package.\
   %global __find_provides %{_mingw64_findprovides} \
   %global __os_install_post %{_mingw64_install_post}
 
+# this macro also disables the default debug package
 %_mingw64_package_header_debug \
+  %global debug_package %{nil} \
   %global __strip %{_mingw64_strip} \
   %global __objdump %{_mingw64_objdump} \
   %global _use_internal_dependency_generator 0 \
diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes
index 8ab0240..d3023f3 100644
--- a/mingw64-filesystem.changes
+++ b/mingw64-filesystem.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Nov 22 10:58:42 UTC 2019 - Ludwig Nussel <lnussel@suse.de>
+
+- disable default debug package only if the mingw debug macro is used
+
 -------------------------------------------------------------------
 Wed Nov 20 13:40:31 UTC 2019 - Ludwig Nussel <lnussel@suse.de>