diff --git a/Rakefile b/Rakefile
index f75ad7e35..5c312fa3f 100755
--- a/Rakefile
+++ b/Rakefile
@@ -111,6 +111,7 @@ def setup_globals
   cflags_common           += " -Ilib/libebml -Ilib/libmatroska"                          if c?(:EBML_MATROSKA_INTERNAL)
   cflags_common           += " #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:USER_CPPFLAGS)}"
   cflags_common           += " -mno-ms-bitfields -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 " if c?(:MINGW)
+  cflags_common           += " -march=i686"                                              if c?(:MINGW) && /i686/.match(c(:host))
   cflags_common           += " -fPIE "                                                   if c?(:USE_QT) && !c?(:MINGW)
   cflags_common           += " -DQT_STATICPLUGIN"                                        if c?(:USE_QT) &&  c?(:MINGW)
 
diff --git a/build-config.in b/build-config.in
index caf00a5b1..95948cd9b 100644
--- a/build-config.in
+++ b/build-config.in
@@ -38,6 +38,8 @@ desktopdir = $(datadir)/applications
 mimepackagesdir = $(datadir)/mime/packages
 icondir = $(datadir)/icons/hicolor
 
+host = @host@
+
 # Common programs
 AR = @AR@
 CC = @CC@