diff --git a/_service b/_service
index 72ddb80..6588f8d 100644
--- a/_service
+++ b/_service
@@ -3,7 +3,7 @@
@PARENT_TAG@
v(.*)
https://github.com/wine-staging/wine-staging.git
- refs/tags/v6.17
+ refs/tags/v6.18
v*.*
git
diff --git a/wine-6.17.tar.xz b/wine-6.17.tar.xz
deleted file mode 100644
index ac6a4cb..0000000
--- a/wine-6.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9db1f2435d80262c3777317df075855aeea3e6a52cb77c630ec1b2b1fb948f08
-size 24838704
diff --git a/wine-6.17.tar.xz.sign b/wine-6.17.tar.xz.sign
deleted file mode 100644
index ac032e8..0000000
--- a/wine-6.17.tar.xz.sign
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmE7wBcACgkQzvrI6q8X
-UZ2dcA/+LyygHvcmg0NWOkUaagBgMigPAMaAaIn0XoIvAdTmpB9qyYVtWuJXIM2T
-Ss/tOfgiY7kRoLYg2OxfBnaPyXAOXUIvzZkdWPQY2h6A/Iy7ON6Ha/MmXdX9BeVf
-RGMG8DaC4biWVdQzyL+3mEmaPHyTz7ylloL4qwtee1rQMy56e2uO2sz0oMp1giBP
-zH7vCDhmOBeKNUWKrh3IoUrBk3kqUawUJvZtTIkMdXwJX785AZWeldU29eL7dUe6
-gUn3B5LA9OK8dafwWzSDkOflZHSLT/F4T2CsygodFmp+0X/rQoU52AiafkGGzzGf
-f7yqDWEoy5UFoW1NNMm4IphYuBv7YULn8e2N+ZmSLYsbU/ZxAqykXBWHz+wc3UAh
-K5pb1PGTZJfiOu/nMkHKbE76gCJJMUJPHePt7g7B8KpXKad5CsExUD7H4ZaiBhsD
-u5GprFmIN7mBrmo5zNKzgUlqAqNY4sMuuJPPwPWPfKwKpvGgy9N2GyAxFKvkV7I8
-ZHCS7mV/39fI2j8ATW3KILvCf1F2VzSiLB0wz6JSeNlWaVDxhM0ZaLFyz/yMxdqe
-0m9OCo/B1ZqvLaqqQ0k+sigWsFayPxHvSJUk8m1tcbFqJC+BXr+1p8W2PgX3mvlI
-pIj2YUCeOuMg1Im1b7OuP2JCcqxTcuIG/pTF4sJWZVWun8Z/QxQ=
-=Lg9T
------END PGP SIGNATURE-----
diff --git a/wine-6.18.tar.xz b/wine-6.18.tar.xz
new file mode 100644
index 0000000..62a1cd4
--- /dev/null
+++ b/wine-6.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fd22e8d64d7333bda4096d73e87ca88f5dd9eda92103d8f79d0673ca7ce6b1d0
+size 24860880
diff --git a/wine-6.18.tar.xz.sign b/wine-6.18.tar.xz.sign
new file mode 100644
index 0000000..2f2d9a2
--- /dev/null
+++ b/wine-6.18.tar.xz.sign
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2iNXmnTUrZr50/lFzvrI6q8XUZ0FAmFONZEACgkQzvrI6q8X
+UZ3PzQ/+Lbin/+oeCgTlUraiNLu9mILy22Cj0X2TWllXAaSoGNFUK9DADoVSFoO8
+0NtQvljzI5H2xXSX88/26yX+mh2dboUxDfSYKuSBlOS4IPDVbNWJCLpNJU4VwyuF
+7tMCyU362jnhCddamQmeQmmLNxqZ+tEphldUocX3ul53Eqw/QaYkOO7uI2mxJ4aE
+/jqvk0soYnOTt9yLlLtoanhcIHssITMb5TnC859Av1gz0+xTJ/LjqeT8aIKf9uK6
+FBHWFngpjQLMCLRBoEsdL6dREaTLVLX8lLLAkavwcB1+XatgqlCOXVKhOS38iCAb
+lVx86qof/ww31geYnBmtoBzCco2ULtC9X06hkd4HGSgWFBFFyb82bjQuZZ1pcFI3
+3rEc7TgMkxv9rIEh8/utLh3Nq2h4vBHcHxWuLdevBduDk60UxI26lPxIbp4OALmG
+nl8pOhesqXR2j4RCp+ZLpxvsYBAHS6MyIlZ0lnLL+JB7jkbcXQDfbJRLkr20BupW
+lg4C7dlNOHkvdOQHGelnG3BEJbY2Ztg5KjKsHy0wKXM+8lPEBECeh0i4E6+jQWF5
+LfKbS7xeZnhXK/wtZtKQejPWswbo6vBCaBdPg7O9b8hMaH3hZZxhCQSPSyV5c70I
+M7TWfk2+TzRxbULHiXRvuG2l/Rm19u0odTnT0zW3nXwsk+L24eU=
+=pfqK
+-----END PGP SIGNATURE-----
diff --git a/wine-staging-6.17.tar.xz b/wine-staging-6.17.tar.xz
deleted file mode 100644
index e1ce2d5..0000000
--- a/wine-staging-6.17.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:86ef6fefe1c2b119cd3d037b6d10584c57ea6549d86811b326bb1d43406f14f7
-size 7336144
diff --git a/wine-staging-6.18.tar.xz b/wine-staging-6.18.tar.xz
new file mode 100644
index 0000000..a59a0d6
--- /dev/null
+++ b/wine-staging-6.18.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9e4e4ab2f54eb74d71a6376a0a2caa447ca0a3d6cba60060257f97662718a974
+size 7340244
diff --git a/wine.changes b/wine.changes
index 3f5ec8d..1bf024f 100644
--- a/wine.changes
+++ b/wine.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sat Sep 25 10:02:13 UTC 2021 - Marcus Meissner
+
+- updated to 6.18 development release
+ - Shell32 and WineBus libraries converted to PE.
+ - Unicode data updated to Unicode version 14.
+ - Mono engine updated to version 6.4.0, with COM improvements.
+ - More work towards Dwarf 3/4 debug support.
+ - HID joystick enabled by default.
+ - Various bug fixes.
+- update staging to 6.18 release
+
-------------------------------------------------------------------
Sat Sep 11 13:26:35 UTC 2021 - Marcus Meissner
diff --git a/wine.spec b/wine.spec
index 5ec9296..1a9ea87 100644
--- a/wine.spec
+++ b/wine.spec
@@ -29,8 +29,8 @@
%endif
# needs to be on top due to usage of %version macro below
-%define realver 6.17
-Version: 6.17
+%define realver 6.18
+Version: 6.18
Release: 0
%if "%{flavor}" != ""
@@ -158,7 +158,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64
%if %{staging}
# upstream patch target version
-%define staging_version 6.17
+%define staging_version 6.18
Source100: wine-staging-%{staging_version}.tar.xz
BuildRequires: gtk3-devel
BuildRequires: libOSMesa-devel