diff --git a/macros.mingw b/macros.mingw
index d741301..95c4fda 100644
--- a/macros.mingw
+++ b/macros.mingw
@@ -37,13 +37,13 @@ run_mingw_configure()                                  \
 %if 0%{?mingw_build_win32} == 1                        \
 mkdir build_win32$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win32$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw32_configure} $@                           \
+    %{?mingw32_configure} "$@"                         \
 popd                                                   \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
 mkdir build_win64$MINGW_BUILDDIR_SUFFIX                \
 pushd build_win64$MINGW_BUILDDIR_SUFFIX                \
-    %{?mingw64_configure} $@                           \
+    %{?mingw64_configure} "$@"                         \
 popd                                                   \
 %endif                                                 \
 }                                                      \
@@ -53,10 +53,10 @@ run_mingw_configure
 run_mingw_make()                                       \
 {                                                      \
 %if 0%{?mingw_build_win32} == 1                        \
-make -C build_win32$MINGW_BUILDDIR_SUFFIX $@           \
+make -C build_win32$MINGW_BUILDDIR_SUFFIX "$@"         \
 %endif                                                 \
 %if 0%{?mingw_build_win64} == 1                        \
-make -C build_win64$MINGW_BUILDDIR_SUFFIX $@           \
+make -C build_win64$MINGW_BUILDDIR_SUFFIX "$@"         \
 %endif                                                 \
 }                                                      \
 run_mingw_make
@@ -67,13 +67,13 @@ run_mingw_cmake()                       \
 %if 0%{?mingw_build_win32} == 1         \
 mkdir build_win32$suffix                \
 pushd build_win32$suffix                \
-    %{?mingw32_cmake $@}                \
+    %{?mingw32_cmake "$@"}              \
 popd                                    \
 %endif                                  \
 %if 0%{?mingw_build_win64} == 1         \
 mkdir build_win64$suffix                \
 pushd build_win64$suffix                \
-    %{?mingw64_cmake $@}                \
+    %{?mingw64_cmake "$@"}              \
 popd                                    \
 %endif                                  \
 }                                       \
@@ -85,13 +85,13 @@ run_mingw_cmake_kde4()                  \
 %if 0%{?mingw_build_win32} == 1         \
 mkdir build_win32$suffix                \
 pushd build_win32$suffix                \
-    %{?mingw32_cmake_kde4 $@}           \
+    %{?mingw32_cmake_kde4 "$@"}         \
 popd                                    \
 %endif                                  \
 %if 0%{?mingw_build_win64} == 1         \
 mkdir build_win64$suffix                \
 pushd build_win64$suffix                \
-    %{?mingw64_cmake_kde4 $@}           \
+    %{?mingw64_cmake_kde4 "$@"}         \
 popd                                    \
 %endif                                  \
 }                                       \
diff --git a/mingw-filesystem.spec b/mingw-filesystem.spec
index 063a624..4b1060f 100644
--- a/mingw-filesystem.spec
+++ b/mingw-filesystem.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-filesystem
 Version:        95
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        MinGW cross compiler base filesystem and environment
 
 Group:          Development/Libraries
@@ -246,6 +246,9 @@ install -m 0644 %{SOURCE12} $RPM_BUILD_ROOT%{_datadir}/mingw/
 
 
 %changelog
+* Thu Apr 19 2012 Kalev Lember <kalevlember@gmail.com> - 95-9
+- Fix whitespace handling in %%mingw_configure and friends
+
 * Sat Mar 17 2012 Kalev Lember <kalevlember@gmail.com> - 95-8
 - Generate the list of mingw32(...) and mingw64(...) DLL name provides from
   mingw-crt import libraries