diff --git a/.gitignore b/.gitignore
index b52479f..beff821 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
-/wine-3.5.tar.xz
-/wine-3.5.tar.xz.sign
+/wine-3.6.tar.xz
+/wine-3.6.tar.xz.sign
+/wine-staging-3.6.tar.gz
diff --git a/sources b/sources
index ce8da2e..87f5673 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
-SHA512 (wine-3.5.tar.xz) = c1e36f3db862fdedd00c3ac20c84c6eb799b53fe32e959b481a6168baf7d9725ed9bd0a97e7f9b651e3ccfba4f8fb623445369be03fde5010ed0fcb0a53e7d3f
-SHA512 (wine-3.5.tar.xz.sign) = 0922beb160f378528c3605b34b82734412d40d0c7fea82598254e16f596e496974f3a21b88f32bf8b0c1ba49e2e1db22615991c96e0bebaa99e24a7b0c51c508
+SHA512 (wine-3.6.tar.xz) = 31d24cc78734bdb743afcec7df05b641ab0625568361401eaf8cd5e217719c8c51a0ef7ed737a560fe42cb9ecd88f10d35e62a98d9df69b966502a5b0dab5a22
+SHA512 (wine-3.6.tar.xz.sign) = 0e3cc6ca6630e94581a09a466eea58148e8ab65fd98b5350aeb7bb3e949c524ce806b760522795047572399fa21f4e12deb15613007cc86da812ec36ce959647
+SHA512 (wine-staging-3.6.tar.gz) = 839731fa3dba91cefd9e0f036b4d688c4786fe8cb19143819457fb9e45a6c14ef3a70630b585abdd424a00036312114034a2529700012ea1863527e45fbfac2a
diff --git a/wine.spec b/wine.spec
index e8ed4bd..6c03fa0 100644
--- a/wine.spec
+++ b/wine.spec
@@ -9,7 +9,7 @@
 # build with compholio-patches, see:  http://www.compholio.com/wine-compholio/
 # wine-staging appears to be dead
 %if 0%{?fedora}
-%global compholio 0
+%global compholio 1
 %endif # 0%{?fedora}
 
 # binfmt macros for RHEL
@@ -21,7 +21,7 @@
 %endif
 
 Name:           wine
-Version:        3.5
+Version:        3.6
 Release:        1%{?dist}
 Summary:        A compatibility layer for windows applications
 
@@ -72,7 +72,7 @@ Patch511:       wine-cjk.patch
 %if 0%{?compholio}
 # wine compholio patches for wine-staging
 # pulseaudio-patch is covered by that patch-set, too.
-Source900: https://github.com/compholio/wine-compholio/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
+Source900: https://github.com/wine-staging/wine-staging/archive/v%{version}.tar.gz#/wine-staging-%{version}.tar.gz
 %endif
 
 %if !%{?no64bit}
@@ -694,13 +694,7 @@ sed -i -e 's!^loader server: libs/port libs/wine tools.*!& include!' Makefile.in
 # disable fortify as it breaks wine
 # http://bugs.winehq.org/show_bug.cgi?id=24606
 # http://bugs.winehq.org/show_bug.cgi?id=25073
-%if 0%{?fedora} < 26
 export CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error"
-%else
-# https://bugzilla.redhat.com/show_bug.cgi?id=1406093
-export TEMP_CFLAGS="`echo $RPM_OPT_FLAGS | sed -e 's/-O2/-O1/'`"
-export CFLAGS="`echo $TEMP_CFLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//'` -Wno-error"
-%endif
 
 %configure \
  --sysconfdir=%{_sysconfdir}/wine \
@@ -1383,9 +1377,6 @@ fi
 %{_libdir}/wine/api-ms-win-shcore-thread-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-shell-shellcom-l1-1-0.dll.so
 %{_libdir}/wine/api-ms-win-shell-shellfolders-l1-1-0.dll.so
-%if 0%{?compholio}
-%{_libdir}/wine/api-ms-win-appmodel-runtime-l1-1-1.dll.so
-%endif
 %{_libdir}/wine/apphelp.dll.so
 %{_libdir}/wine/appwiz.cpl.so
 %{_libdir}/wine/atl.dll.so
@@ -1769,6 +1760,7 @@ fi
 %{_libdir}/wine/snmpapi.dll.so
 %{_libdir}/wine/softpub.dll.so
 %{_libdir}/wine/spoolsv.exe.so
+%{_libdir}/wine/srclient.dll.so
 %{_libdir}/wine/sspicli.dll.so
 %{_libdir}/wine/stdole2.tlb.so
 %{_libdir}/wine/stdole32.tlb.so
@@ -1829,9 +1821,6 @@ fi
 %{_libdir}/wine/windowscodecs.dll.so
 %{_libdir}/wine/windowscodecsext.dll.so
 %{_libdir}/wine/winebus.sys.so
-%if 0%{?compholio}
-%{_libdir}/wine/wined3d-csmt.dll.so
-%endif
 %{_libdir}/wine/winegstreamer.dll.so
 %{_libdir}/wine/winehid.sys.so
 %{_libdir}/wine/winejoystick.drv.so
@@ -2203,6 +2192,10 @@ fi
 %endif
 
 %changelog
+* Sat Apr 14 2018 Michael Cronenworth <mike@cchtml.com> 3.6-1
+- version update
+- enable wine-staging
+
 * Tue Apr 03 2018 Michael Cronenworth <mike@cchtml.com> 3.5-1
 - version update