diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 35f7098ae039..94889ad97144 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -5,8 +5,8 @@
 # Contributor: shild <shildv@gmail.com>
 
 pkgname=xmonad
-pkgver=0.15
-pkgrel=156
+pkgver=0.17.0
+pkgrel=0
 pkgdesc='Lightweight X11 tiled window manager written in Haskell'
 url='https://xmonad.org/'
 arch=('x86_64')
@@ -16,19 +16,16 @@ depends=('ghc' 'haskell-x11' 'sh' 'haskell-utf8-string' 'haskell-extensible-exce
 makedepends=('gendesk' 'uusi')
 optdepends=('xorg-xmessage: for displaying visual error messages')
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/xmonad/xmonad/archive/v${pkgver}.tar.gz
-        $pkgname-ghc9.patch::https://github.com/xmonad/xmonad/commit/2a1a18023a15d13247148638edf29ca6bf9c3bce.patch
         dynamic-compilation.patch
         xmonad.svg)
-sha512sums=('07bf61a1355548679d264e62423dfe6c4ee886aff28ac748588aa7f4f9a4f1bf2afabb1104451fa56f5a3989d79b6044f479d2804e416940e02f52f18b443996'
-            '9b4d20ec1bc24770981ff4848734074d75ffe474d641fa3f3e17e6507bce2aaa0684638a1778cbeea0b209d9cd06793abc8f62fbc0dad0e196f866390bb878b3'
-            'abc598ebc4b55917186cd4d549fc970f53905f820d394ada9a092c08d8833050ad18b23e2f4fd7f281487da2db5b0ca058600e995ac97b18d3be4c62071562d6'
+sha512sums=('87b26b3f6ef3534a5cbb06f6e61b258ecbae0935ae695b39fe574630ccefb97d5e7fa59bf97be34d8009214474c79d0c380d18f67c1fdab2ce4c80378688287e'
+            '48cf86ef42adbc8c85476813497a8800ef5e1cd033570243e357a4b657cf56162bbdd7e9c1a75458804e06883cffe1ee0d50f7038fff58013daaad545d82be82'
             '31f0ceb724a9931aeda75ab706c8908b5d8341af4df50ab1d749814baacb748ad3622601cd99ac03bf936b698fcd854b23d1541e1772306e3337a13a79b110b6')
 
 prepare() {
   gendesk --pkgname "${pkgname}" --pkgdesc "${pkgdesc}"
   cd ${pkgname}-${pkgver}
   patch -p1 -i "${srcdir}/dynamic-compilation.patch"
-  patch -p1 -i "${srcdir}/$pkgname-ghc9.patch"
   uusi -u X11 ${pkgname}.cabal
 }
 
diff --git a/trunk/dynamic-compilation.patch b/trunk/dynamic-compilation.patch
index 6a288454e168..d78a6c7f4965 100644
--- a/trunk/dynamic-compilation.patch
+++ b/trunk/dynamic-compilation.patch
@@ -1,11 +1,11 @@
-diff -ura xmonad-0.13.orig/src/XMonad/Core.hs xmonad-0.13/src/XMonad/Core.hs
---- xmonad-0.13.orig/src/XMonad/Core.hs	2017-06-23 17:13:06.154600231 +0300
-+++ xmonad-0.13/src/XMonad/Core.hs	2017-06-23 17:13:51.021867441 +0300
-@@ -626,6 +626,7 @@
-                           , "-ilib"
-                           , "-fforce-recomp"
-                           , "-main-is", "main"
-+                          , "-dynamic"
-                           , "-v0"
-                           , "-o", bin
-                           ] (Just dir) Nothing Nothing Nothing (Just errHandle)
+diff -ura xmonad-0.17.0.orig/src/XMonad/Core.hs xmonad-0.17.0/src/XMonad/Core.hs
+--- xmonad-0.17.0.orig/src/XMonad/Core.hs       2021-12-29 19:52:29.858195239 +0100
++++ xmonad-0.17.0/src/XMonad/Core.hs    2021-12-29 19:52:59.938194195 +0100
+@@ -668,6 +668,7 @@
+               , "-ilib"
+               , "-fforce-recomp"
+               , "-main-is", "main"
++              , "-dynamic"
+               , "-v0"
+               , "-outputdir", buildDirName dirs
+               , "-o", binFileName dirs