diff --git a/macros.mingw64 b/macros.mingw64
index 4399e24..79f2318 100644
--- a/macros.mingw64
+++ b/macros.mingw64
@@ -100,18 +100,21 @@
 # Template for combined debuginfo and debugsource sub-package.
 # Parameter:
 #    -e exclude BuildArch: noarch
-#    -n package name (-debug will be appended)
-# 
-%_mingw64_debug_package(en:) \
-%package %{-n:-n %{-n*}-}debug \
+#    -n <name> package name (-debug will be appended)
+#    -C <name> add package conflicts
+#    -N <name> full package name
+#
+%_mingw64_debug_package(en:C:N:) \
+%package %{-N:-n %{-N*}}%{!-N:%{-n:-n %{-n*}-debug}%{!-n:debug}} \
 Summary: Debug information for package %{name} \
 Group: Development/Sources \
 %{!-e:BuildArch: noarch} \
-%description %{-n:-n %{-n*}-}debug \
+%{-C:Conflicts:%{-C*}} \
+%description %{-N:-n %{-N*}}%{!-N:%{-n:-n %{-n*}-debug}%{!-n:debug}} \
 This package provides debug information for package %{name}.\
-Debug information is useful when developing applications that use this\
+Debug information is useful when developing applications that use this \
 package or when debugging this package.\
-%files %{-n:-n %{-n*}-}debug -f %{_builddir}/mingw64-debugfiles.list\
+%files %{-N:-n %{-N*}}%{!-N:%{-n:-n %{-n*}-debug}%{!-n:debug}} -f %{_builddir}/mingw64-debugfiles.list \
 %defattr(-,root,root)\
 %{nil}
 
diff --git a/mingw64-filesystem.changes b/mingw64-filesystem.changes
index e4ea539..f8f778b 100644
--- a/mingw64-filesystem.changes
+++ b/mingw64-filesystem.changes
@@ -1,3 +1,25 @@
+-------------------------------------------------------------------
+Fri Feb 21 15:49:16 UTC 2025 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Update to version 20250221
+  * Reverse the use of the current directory in %_mingw64_debug_package;
+    it prevents the building of many packages
+
+-------------------------------------------------------------------
+Thu Feb 20 11:51:39 UTC 2025 - Ralf Habacker <ralf.habacker@freenet.de>
+
+- Update to version 20250220
+- mingw64.macros:
+  * Add parameter '-N' to %_mingw64_debug_package
+    to be able to specify a full package name, which is required
+    by the wine package
+  * Add parameter '-C' to %_mingw64_debug_package to be able
+    to add a Conflicts tag, which is required
+    by the wine package
+  * In %_mingw64_debug_package use actual directory to find
+    the debuginfo files list to be in sync with the native
+    debug package
+
 -------------------------------------------------------------------
 Sun Feb  2 20:32:09 UTC 2025 - Ralf Habacker <ralf.habacker@freenet.de>
 
diff --git a/mingw64-filesystem.spec b/mingw64-filesystem.spec
index 347b5e4..f31aa22 100644
--- a/mingw64-filesystem.spec
+++ b/mingw64-filesystem.spec
@@ -31,7 +31,7 @@
 %define _rpmmacrodir %{_sysconfdir}/rpm
 %endif
 Name:           mingw64-filesystem
-Version:        20250202
+Version:        20250221
 Release:        0
 Summary:        MinGW base filesystem and environment
 License:        GPL-2.0-or-later