diff --git a/.gitignore b/.gitignore
index 68c8868..5e05852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/wine-1.7.39.tar.bz2
-/wine-1.7.39.tar.bz2.sign
-/wine-staging-1.7.39.tar.gz
+/wine-1.7.40.tar.bz2
+/wine-1.7.40.tar.bz2.sign
+/wine-staging-1.7.40.tar.gz
diff --git a/sources b/sources
index 12e114f..3914cb2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-eada8f9fde77a72e1d1f682020d4cbfe  wine-1.7.39.tar.bz2
-3d1c993249d4ca1971a69724657286ab  wine-1.7.39.tar.bz2.sign
-88b30faba37a5889843a96bfbc81af35  wine-staging-1.7.39.tar.gz
+7c1dc804be000d73bc8c2afa623aa9e5  wine-1.7.40.tar.bz2
+042da83227777b8c25d524b343d11081  wine-1.7.40.tar.bz2.sign
+0c89fbe48138c919278e5764042814e4  wine-staging-1.7.40.tar.gz
diff --git a/wine.spec b/wine.spec
index 108dc40..b7e2709 100644
--- a/wine.spec
+++ b/wine.spec
@@ -21,7 +21,7 @@
 %endif
 
 Name:           wine
-Version:        1.7.39
+Version:        1.7.40
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -618,7 +618,7 @@ This package adds the opencl driver for wine.
 %setup -q
 %patch511 -p1 -b.cjk
 %if 0%{?fedora} > 21
-%patch512 -p1 -b.gcc5
+#patch512 -p1 -b.gcc5
 %endif
 
 # setup and apply compholio-patches or pulseaudio-patch.
@@ -649,7 +649,7 @@ autoreconf
 # http://bugs.winehq.org/show_bug.cgi?id=24606
 # http://bugs.winehq.org/show_bug.cgi?id=25073
 %if 0%{?fedora} > 21
-export TEMP_CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O1/'`"
+export TEMP_CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O0/'`"
 export CFLAGS="`echo $TEMP_CFLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error"
 %else
 export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error"
@@ -1268,6 +1268,9 @@ fi
 %{_libdir}/wine/ext-ms-win-gdi-devcaps-l1-1-0.dll.so
 %{_libdir}/wine/faultrep.dll.so
 %{_libdir}/wine/fltlib.dll.so
+%if 0%{?compholio}
+%{_libdir}/wine/fltmgr.sys.so
+%endif
 %{_libdir}/wine/fntcache.dll.so
 %{_libdir}/wine/fontsub.dll.so
 %{_libdir}/wine/fusion.dll.so
@@ -1852,6 +1855,9 @@ fi
 %{_libdir}/wine/opencl.dll.so
 
 %changelog
+* Mon Apr 06 2015 Michael Cronenworth <mike@cchtml.com> 1.7.40-1
+- version upgrade
+
 * Sun Mar 22 2015 Michael Cronenworth <mike@cchtml.com> 1.7.39-1
 - version upgrade
 - Enable some optimizations and workarounds for GCC5 regressions