diff --git a/mingw32-openssl-1.0.0-beta3-configure.patch b/mingw32-openssl-1.0.0-beta3-configure.patch
deleted file mode 100644
index 8f4679e..0000000
--- a/mingw32-openssl-1.0.0-beta3-configure.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up openssl-1.0.0-beta3/Configure.mingw-configure openssl-1.0.0-beta3/Configure
---- openssl-1.0.0-beta3/Configure.mingw-configure	2009-08-29 21:20:14.000000000 +0300
-+++ openssl-1.0.0-beta3/Configure	2009-08-29 21:23:14.000000000 +0300
-@@ -498,7 +498,7 @@ my %table=(
- "BC-32","bcc32::::WIN32::BN_LLONG DES_PTR RC4_INDEX EXPORT_VAR_AS_FN:${no_asm}:win32",
- 
- # MinGW
--"mingw", "gcc:-mno-cygwin -DL_ENDIAN -DOPENSSL_NO_CAPIENG -fomit-frame-pointer -O3 -march=i486 -Wall:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:-mno-cygwin:.dll.a",
-+"mingw", "gcc:-DL_ENDIAN -DOPENSSL_NO_CAPIENG -Wall \$(MINGW32_CFLAGS) -DMK1MF_BUILD:::MINGW32:-lws2_32 -lgdi32:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts} EXPORT_VAR_AS_FN:${x86_asm}:coff:win32:cygwin-shared:-D_WINDLL -DOPENSSL_USE_APPLINK:\$(MINGW32_CFLAGS):.dll.a",
- # As for OPENSSL_USE_APPLINK. Applink makes it possible to use .dll
- # compiled with one compiler with application compiled with another
- # compiler. It's possible to engage Applink support in mingw64 build,
diff --git a/mingw32-openssl.spec b/mingw32-openssl.spec
index 79cc7af..77e2fa3 100644
--- a/mingw32-openssl.spec
+++ b/mingw32-openssl.spec
@@ -81,8 +81,6 @@ Patch53:        openssl-1.0.0-name-hash.patch
 # Backported fixes including security fixes
 
 # MinGW-specific patches.
-# Use MINGW32_CFLAGS (set below) in Configure script
-Patch100:       mingw32-openssl-1.0.0-beta3-configure.patch
 # Rename *eay32.dll to lib*.dll
 Patch101:       mingw32-openssl-1.0.0-beta3-libversion.patch
 # Fix engines/ install target after lib rename
@@ -181,11 +179,13 @@ Static version of the MinGW port of the OpenSSL toolkit.
 %patch52 -p1 -b .aesni
 %patch53 -p1 -b .name-hash
 
-%patch100 -p1 -b .mingw-configure
 %patch101 -p1 -b .mingw-libversion
 %patch102 -p1 -b .mingw-sfx
 %patch105 -p0 -b .mingw-linker-fix
 
+# Use _mingw32_cflags instead of hardcoded ones
+sed -i -e '/^"mingw"/ s/-fomit-frame-pointer -O3 -march=i486 -Wall/%{_mingw32_cflags}/' Configure
+
 # Modify the various perl scripts to reference perl in the right location.
 perl util/perlpath.pl `dirname %{__perl}`
 
@@ -196,7 +196,6 @@ make TABLE PERL=%{__perl}
 %build
 # NB: 'no-hw' is vital.  MinGW cannot build the hardware drivers
 # and if you don't have this you'll get an obscure link error.
-export MINGW32_CFLAGS="%{_mingw32_cflags}"; \
 ./Configure \
   --prefix=%{_mingw32_prefix} \
   --openssldir=%{_mingw32_sysconfdir}/pki/tls \
@@ -346,6 +345,7 @@ rm -rf $RPM_BUILD_ROOT
 * Sat Jun 19 2010 Kalev Lember <kalev@smartlink.ee> - 1.0.0a-1
 - Updated to openssl 1.0.0a
 - Synced patches with Fedora native openssl-1.0.0a-1
+- Use sed to fix up cflags instead of unmaintainable patch
 
 * Thu Nov 26 2009 Kalev Lember <kalev@smartlink.ee> - 1.0.0-0.6.beta4
 - Merged patches from native Fedora openssl (up to 1.0.0-0.16.beta4)