diff --git a/_service b/_service
index a82b60a..6d5e14d 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">v(.*)</param>
     <param name="url">https://github.com/wine-staging/wine-staging.git</param>
-    <param name="revision">refs/tags/v3.5</param>
+    <param name="revision">refs/tags/v3.6</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>
diff --git a/wine-3.5.tar.xz b/wine-3.5.tar.xz
deleted file mode 100644
index 1429719..0000000
--- a/wine-3.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f42206143b7caf5527dbcd54c21f9b0a22338d8841d7fa08aa6c5f0b9dd72143
-size 19963436
diff --git a/wine-3.5.tar.xz.sign b/wine-3.5.tar.xz.sign
deleted file mode 100644
index 9e1510d..0000000
--- a/wine-3.5.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlq+dIsACgkQzvrI6q8X
-UZ0i5g//d0ogsiraO0stVPknMqW+AQMJpOxHweBwb8XGmeAM5H4zZpMAv7tsTI8m
-JKZ4V/VVKMK6Tp0u+qCoVYopNQP0qKw7PQ+pCHtzbfoi0urTot+6GQdB6QJ1TDsg
-MIka2zXRWGjHO/41ClAgm6C59qY14ZRMWdb4Hvir4VugAo6kTfu8vjyr1YtqILrd
-MZs9auTYuJPhXTUQPHBDWEVDesphyvIs6BsexirQ6XK4wCvXg+veC/RfkLeTuoQ0
-9vmEsBQ4BsH0a5ibwtGDvxZY4etzA+DCH7aKD4BAsWR2ete11ga/EkWuITHfKY5z
-2cnv4kb033jOcGLTPxN8yXGA/RNKFvnlzB7uoNQ8EoRvFADgcNXKlDA7ZJoS6ZIs
-ru2TzNXVEBuW+ZvIo57rSkMcWJ3qHBLzVDB/FMmEeVm3QXzgbNkhNDkB6Q7baMcV
-/xjP0b4V3g6DzpAHOa7scZYCQR3EJt+F6DvWQAFCe0v166cSPeDZyQjXFvxND4yJ
-t66nrnyxcpXnmAOylQmHgD6AosvtBIbR9wPLTSjnZAhMQpRbq/pdHuabYa6Exlja
-gQJAFSP7+eAD1VvweNAqenp0sr2T2mT3FkXdrdWglaxpNtRtxe7VmrIsg5GMI+/I
-qqV/665LCwlYw2HW+0ckqlltn/i/kB/JBPtnCrJXYFJb62BB8MI=
-=odaz
------END PGP SIGNATURE-----
diff --git a/wine-3.6.tar.xz b/wine-3.6.tar.xz
new file mode 100644
index 0000000..f878ca9
--- /dev/null
+++ b/wine-3.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:78502dc79a60430d2a2ef66bee146e38eb6dd679fd36b54acfc8f9b2ac07905c
+size 20005240
diff --git a/wine-3.6.tar.xz.sign b/wine-3.6.tar.xz.sign
new file mode 100644
index 0000000..de57b4d
--- /dev/null
+++ b/wine-3.6.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlrRGN0ACgkQzvrI6q8X
+UZ0BeQ/9ETZJBnOEqPoqpwfbG3qW3Y5IZFKhzU6LcJ/qdeVxsFGI5Mf+RkYYd3Hi
+aSBNQdPxkz2lg2p9u8pVQfjI4z0g6h/RsRV7xiqA5ro00jWvBjTgA1y0spDoQ7lm
+JqEs9gsL+uvy+/NWqdkcxR9BZP2Z0accStryo4oEeNfeejEEJlm0aeERQWqUttcJ
+Xp/ijhtqFJrcGt5/ZJnnp6DaHsM2Fzn3XWydFT3cvuwavKRgZ1pKQShuQAEfXAyo
+SjCXAuP5lRc6hp4Vd0ohSQgcg4fKqftYq32+nLa6j4xEa/NW5L5s4aJBdibA21dF
+RJkTWBbx0E7CVwLSKy6uU3man5NhRco1PjEcp3ib/pfyTsVqAeOnbqVJ83YPmtqZ
+zBPn7vEFfHjYRkXcCkKdM+jp8Gzqxn7qcUwM7W3W9kdmKaoROydUmlkvBFmX5Gao
+okl9pa7ZsLf72E9heepycvsTXvPlk/m0bUuKNQ1frLVRBaSv3d0bQ9Nx9SpbSoP7
+QVLFEQaX+zR40B9T95d8NMk2yoDrnSmdlIMYDDJ3mg2Qt5Eikl7yYc6k0ZGcabbv
+LydHCik9eHi6oty8womz6JByJbwQGOGBrduyIq/5DfA0W2/vZvlggCT+UtJMrv6O
+Fc2lZzC3QLi20MkPf955yO2+hLVR2MP9hIGo+Xs5CpFh+b2NR68=
+=ucD1
+-----END PGP SIGNATURE-----
diff --git a/wine-staging-3.5.tar.xz b/wine-staging-3.5.tar.xz
deleted file mode 100644
index ee70440..0000000
--- a/wine-staging-3.5.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b197cf6d1e5c95d979040e99f374c1e2bb2260cf66749635722500a199347c83
-size 7589240
diff --git a/wine-staging-3.6.tar.xz b/wine-staging-3.6.tar.xz
new file mode 100644
index 0000000..5a56287
--- /dev/null
+++ b/wine-staging-3.6.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4250210cc40104817a3f3b7d84c70f1d56b1e86d95879f69a5ff62698b5cc624
+size 7541896
diff --git a/wine.changes b/wine.changes
index 80cacc1..596dc6c 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Apr 14 13:09:33 UTC 2018 - meissner@suse.com
+
+- Update to 3.6 development release
+  - Support for PNG format icons.
+  - Support for 1D textures.
+  - More infrastructure for high DPI support.
+  - OLE data cache improvements.
+  - Various bug fixes.
+- updated winetricks
+- updated staging to 3.5
+
 -------------------------------------------------------------------
 Wed Apr  4 06:50:06 UTC 2018 - schwab@suse.de
 
diff --git a/wine.spec b/wine.spec
index 5da11c2..bd4de98 100644
--- a/wine.spec
+++ b/wine.spec
@@ -101,8 +101,8 @@ BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(zlib)
-%define realver 3.5
-Version:        3.5
+%define realver 3.6
+Version:        3.6
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1-or-later
@@ -140,7 +140,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc %arm aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 3.5
+%define staging_version 3.6
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
diff --git a/winetricks b/winetricks
index 203e085..8798aa9 100644
--- a/winetricks
+++ b/winetricks
@@ -11032,9 +11032,9 @@ load_lucida()
 w_metadata opensymbol fonts \
     title="OpenSymbol fonts (replacement for Wingdings)" \
     publisher="OpenOffice.org" \
-    year="2016" \
+    year="2017" \
     media="download" \
-    file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u9_all.deb" \
+    file1="fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u10_all.deb" \
     installed_file1="$W_FONTSDIR_WIN/opens___.ttf"
 
 load_opensymbol()
@@ -11042,7 +11042,7 @@ load_opensymbol()
     # The OpenSymbol fonts are a replacement for the Windows Wingdings font from OpenOffice.org.
     # Need to w_download Debian since I can't find a standalone download from OpenOffice
     # Note: The source download package on debian is for _all_ of OpenOffice, which is 266 MB.
-    w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u9_all.deb" 11f272c3de3f2d891dfd067f467263ff361c08566a1a0ee5e5d64cbee459ee22
+    w_download "http://security.debian.org/debian-security/pool/updates/main/libr/libreoffice/fonts-opensymbol_102.2+LibO3.5.4+dfsg2-0+deb7u10_all.deb" 33fe227786ae6dd89d265199bf3c03f09e540a5d2b96a38d7a581b4a039db696
 
     w_try_cd "$W_TMP"
     w_try_ar "$W_CACHE/$W_PACKAGE/$file1" data.tar.xz