diff --git a/gpgkey-A4FAD9CEDA213AF3.asc b/gpgkey-A4FAD9CEDA213AF3.asc
new file mode 100644
index 0000000..11c34af
--- /dev/null
+++ b/gpgkey-A4FAD9CEDA213AF3.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEaANvfhYJKwYBBAHaRw8BAQdAKfiAcknosvicdTfrBUaqbgapmybkXg3C9gn5
+kN8KO3i0L0ZlcmRpbmFuZCBCYWNobWFubiA8ZmVyZGluYW5kLmJhY2htYW5uQHly
+bGYuYXQ+iJkEExYKAEEWIQQIdIm2eaaa0pLuX96k+tnO2iE68wUCaANwBQIbAwUJ
+BaOagAULCQgHAgIiAgYVCgkICwIEFgIDAQIeBwIXgAAKCRCk+tnO2iE68+JWAQC+
++68UEdSntggJPl7QKWGHppGDvWm0e5mdvSywaUsvwwEAu3k3ultnTGWkxTePxlgJ
+h/qIionGA1NTlMTRm7VkGAG0H0ZlcmRpbmFuZCBCYWNobWFubiA8bWVAeXJsZi5h
+dD6ImQQTFgoAQRYhBAh0ibZ5pprSku5f3qT62c7aITrzBQJoA29+AhsDBQkFo5qA
+BQsJCAcCAiICBhUKCQgLAgQWAgMBAh4HAheAAAoJEKT62c7aITrzmIIA/jpgXKsj
+3ExbldxClI87zEba2Gdw6aTl365mDeDPqmC4AQDFRIKcDbxNKI1R1qcTVMRmlMD1
+4oVR78tOSoh28WNAAbg4BGgDb34SCisGAQQBl1UBBQEBB0Dkr8GbKK0+I775dVD4
+UhlLy/oMmj+dKrQ4ruE03nuuRgMBCAeIfgQYFgoAJhYhBAh0ibZ5pprSku5f3qT6
+2c7aITrzBQJoA29+AhsMBQkFo5qAAAoJEKT62c7aITrzO5cA/1EbrScWVj2gJcxV
+yErNpG4rvPe0bU9NFJUb3TdD4HV4AQDwBUSQthcSBt2hPKmL0247LLR4RETLALRI
+11pEh488BQ==
+=78ln
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/gpgkey-BC1D9BD570235175.asc b/gpgkey-BC1D9BD570235175.asc
deleted file mode 100644
index be5bd46..0000000
--- a/gpgkey-BC1D9BD570235175.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mDMEX7g8nxYJKwYBBAHaRw8BAQdAXblPh+ZsR6CBZojhMrbV/I401Fgq77bV2Qhx
-75iz5zC0L0ZlcmRpbmFuZCBCYWNobWFubiA8ZmVyZGluYW5kLmJhY2htYW5uQHly
-bGYuYXQ+iJYEExYIAD4WIQTABpbR12XtqnOTNym8HZvVcCNRdQUCX7g9CAIbAwUJ
-CWYBgAULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRC8HZvVcCNRdTrtAP9RTfgC
-YWxAG2PIR7tuNEz7knMbPuEqr4vcZrH8ueYT2AD/Qdzvk4EP9SmkC62UOHD76JmO
-QS2AcCzpmYT4HLyD9QK0En55cmxmIDxtZUB5cmxmLmF0PoiZBBMWCABBAhsDBQkJ
-ZgGABQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAFiEEwAaW0ddl7apzkzcpvB2b1XAj
-UXUFAl+4PpgCGQEACgkQvB2b1XAjUXXHhwD/cGWeXKXejsxBMqBg4XBEMh/XgVyj
-pdEBZMrL1hBOn44A/0MF8sPssbZDB+DjcClE7b1r3nmK+E6rKrNdhwaN7DcPuDgE
-X7g8nxIKKwYBBAGXVQEFAQEHQHqRdYv7x02aqzBK+woH0bH0V1eoKjNAhctksZyZ
-NWlqAwEIB4h+BBgWCAAmFiEEwAaW0ddl7apzkzcpvB2b1XAjUXUFAl+4PJ8CGwwF
-CQlmAYAACgkQvB2b1XAjUXX2QgD/TsfKmLHnWRtc36xp9mHCz5iTJ6czTDDONCZH
-UlC6SucBAIrVZNB9dTy5XBw5sj6mRknnzQXiequ/wRbwug3uXt0K
-=NKsJ
------END PGP PUBLIC KEY BLOCK-----
diff --git a/sources b/sources
index f2025f0..baf8857 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (wl-mirror-0.16.2.tar.gz) = f7860bdf222c95ebe30216288fb0d7d18a16f35da2e57e871900dcf3205287799ce5fdbe64c765a432f24ac94c4fbafb55b61e8fb820cc17472941eb29ca662a
-SHA512 (wl-mirror-0.16.2.tar.gz.sig) = 072fd1b97405ad72146a0427c2e2eb6f2059106154a03ae4b32315fc664d9fe6b64e81edd73333ba4d6bf74a55c17cbe2c6500377e31606b44c2867fe86effb6
+SHA512 (wl-mirror-0.18.5.tar.gz) = 2e92f027495fd43c16ef911b103a154bb635a1ed5844a20c526d09ee8a5bbbf2dd70b722c3e7d060082b2fe2bcade1ec1cd40bdbdc9a3c8eba5ab5793aa8ac7a
+SHA512 (wl-mirror-0.18.5.tar.gz.sig) = 4417e0f9b2fae9c4689dfda066475d34fd7be87f2430f5e4444b89d2ab8c34ce4f3aef3b039839d6a483600a4bb3f14faf99df6337b944b0896df2aa09c49070
diff --git a/wl-mirror.spec b/wl-mirror.spec
index e443fd1..873e051 100644
--- a/wl-mirror.spec
+++ b/wl-mirror.spec
@@ -1,5 +1,5 @@
 Name:           wl-mirror
-Version:        0.16.2
+Version:        0.18.5
 Release:        %autorelease
 Summary:        Simple Wayland output mirror client
 
@@ -8,18 +8,21 @@ URL:            https://github.com/Ferdi265/%{name}
 Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Source1:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz.sig
 # Ferdinand Bachmann <ferdinand.bachmann@yrlf.at> at keys.openpgp.org
-Source2:        gpgkey-BC1D9BD570235175.asc
+Source2:        gpgkey-A4FAD9CEDA213AF3.asc
 
 BuildRequires:  cmake
 BuildRequires:  gcc
-BuildRequires:  gnupg2
+BuildRequires:  gpgverify
 BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(gbm)
 BuildRequires:  pkgconfig(glesv2)
+BuildRequires:  pkgconfig(libdecor-0)
 BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(libdrm)
 BuildRequires:  pkgconfig(wayland-egl)
 BuildRequires:  pkgconfig(wayland-scanner)
 BuildRequires:  pkgconfig(scdoc)
-BuildRequires:  wayland-protocols-devel >= 1.31
+BuildRequires:  wayland-protocols-devel >= 1.37
 
 # wlr-protocols may have different licenses, but it does not affect
 # the generated code or the binary file license
@@ -42,7 +45,9 @@ rm -rf proto/wayland-protocols
 %cmake \
     -DFORCE_SYSTEM_WL_PROTOCOLS:BOOL=ON \
     -DINSTALL_DOCUMENTATION:BOOL=ON \
-    -DINSTALL_EXAMPLE_SCRIPTS:BOOL=ON
+    -DINSTALL_EXAMPLE_SCRIPTS:BOOL=ON \
+    -DWITH_GBM:BOOL=ON \
+    -DWITH_LIBDECOR:BOOL=ON
 %cmake_build