diff --git a/mingw32-filesystem.spec b/mingw32-filesystem.spec
index f7e8458..4cc2959 100644
--- a/mingw32-filesystem.spec
+++ b/mingw32-filesystem.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 
 Name:           mingw32-filesystem
-Version:        54
+Version:        55
 Release:        1%{?dist}
 Summary:        MinGW base filesystem and environment
 
@@ -166,6 +166,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep  1 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 55-1
+- The wrapper scripts i686-pc-mingw32-pkg-config, mingw32-pkg-config,
+  mingw32-configure, mingw32-make and mingw32-cmake had a bug where
+  quoted arguments could get interpreted incorrect.
+  Thanks to Michael Ploujnikov for helping out with this issue
+
 * Sat Aug 29 2009 Erik van Pienbroek <epienbro@fedoraproject.org> - 54-1
 - Added the file /usr/bin/i686-pc-mingw32-pkg-config which is a wrapper script
   which calls pkg-config with the right environment variables set (BZ #513825)
diff --git a/mingw32-scripts.sh b/mingw32-scripts.sh
index adc1e95..f068e0a 100755
--- a/mingw32-scripts.sh
+++ b/mingw32-scripts.sh
@@ -26,4 +26,8 @@ if [ "`basename $0`" = "i686-pc-mingw32-pkg-config" ] ; then
 else
     NAME="_`basename $0|tr -- - _`"
 fi
-eval "`rpm --eval "%{$NAME}"`" "$@"
+
+# NOTE: The use of 'eval' in combination with '$@' is a potential security risk
+#       We should find a more safe replacement for this command
+#       Suggestions are welcome at the Fedora MinGW mailing list
+eval "`rpm --eval "%{$NAME}"`" '"$@"'