diff --git a/_service b/_service
index 5c002ed..ccc027c 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.17</param>
+    <param name="revision">refs/tags/v3.18</param>
     <param name="match-tag">v*.*</param>
     <param name="scm">git</param>
   </service>
@@ -11,7 +11,7 @@
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="versionrewrite-pattern">wined3d9(.*)</param>
     <param name="url">https://github.com/sarnex/wine-d3d9-patches.git</param>
-    <param name="revision">refs/tags/wine-d3d9-3.16</param>
+    <param name="revision">refs/tags/wine-d3d9-3.17</param>
     <param name="scm">git</param>
   </service>
   <service name="recompress" mode="disabled">
diff --git a/wine-3.17.tar.xz b/wine-3.17.tar.xz
deleted file mode 100644
index d7e138c..0000000
--- a/wine-3.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4cede2e1de426af2430abee84afd77379a1f4f05c3ec9cd4280110de54fccc21
-size 21457736
diff --git a/wine-3.17.tar.xz.sign b/wine-3.17.tar.xz.sign
deleted file mode 100644
index 9264731..0000000
--- a/wine-3.17.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAluufkIACgkQzvrI6q8X
-UZ2AkxAAm+8bI2mQbMk217khKby/Plc+plU4nqMOGKY4TQgmteb1RN+5lCXYRduQ
-ueffJis6oy9EmPRgCsA+Izms3w1jZlSmxcmVgPr4ZiKOno5SU2ebjQJuusvOMQEm
-C1/k1jEEsREpy2ZW8yNoGoZpUnRqkktWN0jo1HHF8HpyIJRolO22ehWB6IFvVn9q
-r9uBAHwvB0Xltfp+jynaCeUUx6xxUwixVosM6g5Sr3XltQt5zhL/mzgXkd4bdjLC
-fu32gKJSP6GB9sJZr3oQtYjhmE7E1fvEQcfrwbGscxmH6szAgqPRDX3pZYa9LOzL
-GCQ5wcuxkXYJm1y1VQkOZxfxNKMmRxiDxp8igIWY2jXJELaa4Dc4LhmESh74oGo0
-bhU9p9gyWMgRtWFbKFi74SserAhd8hf6+KZiR1PnAW1tpnyGJk861hTabtRSjIQv
-NVGABNuUEMRB1Qjaf52p5uico2FtlwonO1GFuFzOfwRQHbYAafaUBj/P7keyYbD6
-cJZ8jvVGuJ21t/dTvBOWr21qf3NNjCvMfSt2xsJQB4XCjTCyoMRMHv4uVsVEtixt
-FpasZ7NMbT3mVFYmlB/iA0d5NAzpFDGrdf+wLlfLFkixsWfqCfez7XJo8eOrGg7s
-c5bnhbbamjxSIjdnAtVMfB2WkYlgAjFXzIoJXKwjXwNePeHy87U=
-=ijDG
------END PGP SIGNATURE-----
diff --git a/wine-3.18.tar.xz b/wine-3.18.tar.xz
new file mode 100644
index 0000000..d60b226
--- /dev/null
+++ b/wine-3.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9be8d44b1b22814c76e6214fe8ce657ae90a7a17879e5cd2b2a87ad6a1391a77
+size 21479964
diff --git a/wine-3.18.tar.xz.sign b/wine-3.18.tar.xz.sign
new file mode 100644
index 0000000..7ef8acf
--- /dev/null
+++ b/wine-3.18.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAlvBJ28ACgkQzvrI6q8X
+UZ1xwA/+O8VJtIEO8ncMoPQwc+fmNw7ucuQSSLtzXJjXWA9PIIzFs9ix9B80gb5N
+7QINXvFG5yQMEd9+LvvmU1iuPnztJ7xsL+CTJoeNZk3OB2LzTaGFIKTizSoQ2BJw
+qIkBZGLw+FPZdkz8OVatPl8jkvoWFn4WomCq19jLXx7asyJG0N24jPHv6k3hNePJ
+We/EHM78R31NgXZ6yhLjF3hrMid/bmeRteQh4ZPRh6w8pqBIKplzvEPSjniV/Te2
+vmsbYIuvObOw5yr/COKuciDuhohGywNwso/Rupwx3DqE5aiHHbAM0XK1700sxG1R
+tyKVgd4+8/hVbnx7wwpUD6uXRavlNajMFVsZ9PTAcYsuUyiAGx0VeHpcBIkFk3De
+Y1FTLZ8NllmbniAME3jPWHQ1iiZ2f4z33sTB1U32je0djezcIQYG4NNbZeqUt3Iv
+UgozgZf4ifgWTFhXn4bdtYLib7buFuNd0SAc5PbsqlnsygXR2EEfpqkIvqMWPE32
+136+0NNvIiLCPu+EgOCrlF33HuvCGhj+hHhJpiKa5kYKI8wet2y98Lo5QaiTzjcc
+un19jxhXEidNYv89IkjDZ5HlMpXUioMF3/uAJtHndLNzfko8F2T8SGChS8LvMcwf
+tyFOcibap5D6ZpKu/PdYjssor5yB0KObOEAnzKiXhfwOlfC7FjM=
+=ThJz
+-----END PGP SIGNATURE-----
diff --git a/wine-d3d9-patches-3.16.tar.xz b/wine-d3d9-patches-3.16.tar.xz
deleted file mode 100644
index bcc981c..0000000
--- a/wine-d3d9-patches-3.16.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b4c3325e47c108f99c97f72756bdea01f16356d86bf30a22463e63aaf97fb26b
-size 42256
diff --git a/wine-d3d9-patches-3.17.tar.xz b/wine-d3d9-patches-3.17.tar.xz
new file mode 100644
index 0000000..13712a9
--- /dev/null
+++ b/wine-d3d9-patches-3.17.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:58528d0473c8c6ac1382216cb4b2030141e0955ea23543c874b13a8f54595193
+size 42268
diff --git a/wine-staging-3.17.tar.xz b/wine-staging-3.17.tar.xz
deleted file mode 100644
index c9469ec..0000000
--- a/wine-staging-3.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:31d4c1cdaef9090a951dac612250f8c899f52a054cbdf828dd03d6cf6a31259a
-size 7519956
diff --git a/wine-staging-3.18.tar.xz b/wine-staging-3.18.tar.xz
new file mode 100644
index 0000000..27d46da
--- /dev/null
+++ b/wine-staging-3.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:79090fe4b2a83e280099273fdfb241fb1018e16b76eeb6ed320c16b87838c975
+size 7512728
diff --git a/wine.changes b/wine.changes
index 4ed5b2c..07165f7 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Oct 13 07:43:30 UTC 2018 - meissner@suse.com
+
+- Update to 3.18 development release
+  - Subpixel font rendering with FreeType >= 2.8.1.
+  - Support for OAEP algorithm in RSA encryption.
+  - Array marshalling fixes in DCOM.
+  - Improved DPI scaling in the Wine console.
+  - Various bug fixes.
+- updated staging to 3.18
+- updated winetricks
+
 -------------------------------------------------------------------
 Sat Sep 29 08:28:25 UTC 2018 - meissner@suse.com
 
diff --git a/wine.spec b/wine.spec
index b0b123b..5689e04 100644
--- a/wine.spec
+++ b/wine.spec
@@ -107,8 +107,8 @@ BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xrender)
 BuildRequires:  pkgconfig(xxf86vm)
 BuildRequires:  pkgconfig(zlib)
-%define realver 3.17
-Version:        3.17
+%define realver 3.18
+Version:        3.18
 Release:        0
 Summary:        An MS Windows Emulator
 License:        LGPL-2.1-or-later
@@ -146,7 +146,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 ExclusiveArch:  %{ix86} x86_64 ppc %arm aarch64
 %if %{staging}
 # upstream patch target version
-%define staging_version 3.17
+%define staging_version 3.18
 Source100:      wine-staging-%{staging_version}.tar.xz
 BuildRequires:  gtk3-devel
 BuildRequires:  libOSMesa-devel
@@ -154,7 +154,7 @@ BuildRequires:  libva-devel
 %endif
 %if %{nine}
 # upstream patch target version
-%define nine_version 3.16
+%define nine_version 3.17
 BuildRequires:  Mesa-libd3d-devel
 BuildRequires:  libOSMesa-devel
 BuildRequires:  pkgconfig(dri2proto)