diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 7a42155c6e22..10891404ee86 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -1,44 +1,35 @@
 # Created by: Matthieu Guegan <matt.guegan@free.fr>
 
 PORTNAME=	xmonad
-PORTVERSION=	0.15
-PORTREVISION=	9
+PORTVERSION=	0.17.0
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Tiling window manager
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	ghc:lang/ghc
 
 USES=		cabal xorg
 
 USE_XORG=	x11 xext xinerama xrandr xscrnsaver
 
-USE_CABAL=	X11-1.9.1 \
-		data-default-0.7.1.1 \
+USE_CABAL=	X11-1.10.2 \
 		data-default-class-0.1.2.0 \
-		data-default-instances-containers-0.0.1 \
-		data-default-instances-dlist-0.0.1 \
-		data-default-instances-old-locale-0.0.1 \
-		dlist-0.8.0.8 \
-		extensible-exceptions-0.1.1.4 \
-		hsc2hs-0.68.7 \
-		old-locale-1.0.0.7_2 \
-		setlocale-1.0.0.9_2 \
-		utf8-string-1.0.1.1_3
+		hsc2hs-0.68.7_1 \
+		setlocale-1.0.0.10
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${STAGEDIR}${MANPREFIX}/man/man1/
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_SCRIPT} ${PATCHDIR}/example_buildscript ${STAGEDIR}${EXAMPLESDIR}/build
 	${INSTALL_DATA} ${PATCHDIR}/example_config.cabal ${STAGEDIR}${EXAMPLESDIR}/xmonad-config.cabal
 	${INSTALL_DATA} ${WRKSRC}/man/xmonad.hs ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index ffe2772f60e4..25c18e38b025 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,33 +1,13 @@
-TIMESTAMP = 1592677940
-SHA256 (cabal/xmonad-0.15.tar.gz) = 4a7948e6eee5e34a27d15444589ade3b3fa1adecadbf37b943cff8348380f928
-SIZE (cabal/xmonad-0.15.tar.gz) = 68822
-SHA256 (cabal/X11-1.9.1/X11-1.9.1.tar.gz) = 7581e7b3c1c8313d1f7d224d57b20c689e5f757404c9f0ec47f4d15c4541e63d
-SIZE (cabal/X11-1.9.1/X11-1.9.1.tar.gz) = 190698
-SHA256 (cabal/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz) = b0f95d279cd75cacaa8152a01590dc3460f7134f6840b37052abb3ba3cb2a511
-SIZE (cabal/data-default-0.7.1.1/data-default-0.7.1.1.tar.gz) = 1627
+TIMESTAMP = 1635526944
+SHA256 (cabal/xmonad-0.17.0.tar.gz) = 1eb74d69fc62dc0d4124fb169430328c975440ffa257766de0b71b9e7ebb1a13
+SIZE (cabal/xmonad-0.17.0.tar.gz) = 93489
+SHA256 (cabal/X11-1.10.2/X11-1.10.2.tar.gz) = e12f643da6b3246341cf17b8bb22070ecda748113addae1ae116e993e801e2c6
+SIZE (cabal/X11-1.10.2/X11-1.10.2.tar.gz) = 192634
 SHA256 (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 4f01b423f000c3e069aaf52a348564a6536797f31498bb85c3db4bd2d0973e56
 SIZE (cabal/data-default-class-0.1.2.0/data-default-class-0.1.2.0.tar.gz) = 2522
-SHA256 (cabal/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz) = a55e07af005c9815d82f3fc95e125db82994377c9f4a769428878701d4ec081a
-SIZE (cabal/data-default-instances-containers-0.0.1/data-default-instances-containers-0.0.1.tar.gz) = 1659
-SHA256 (cabal/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz) = 7d683711cbf08abd7adcd5ac2be825381308d220397315a5570fe61b719b5959
-SIZE (cabal/data-default-instances-dlist-0.0.1/data-default-instances-dlist-0.0.1.tar.gz) = 1503
-SHA256 (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 60d3b02922958c4908d7bf2b24ddf61511665745f784227d206745784b0c0802
-SIZE (cabal/data-default-instances-old-locale-0.0.1/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
-SHA256 (cabal/dlist-0.8.0.8/dlist-0.8.0.8.tar.gz) = 7129cf18068d3384e305708a10426ab8f573bee1030b023a114f45f1d0ec496d
-SIZE (cabal/dlist-0.8.0.8/dlist-0.8.0.8.tar.gz) = 9262
-SHA256 (cabal/extensible-exceptions-0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz) = 6ce5e8801760385a408dab71b53550f87629e661b260bdc2cd41c6a439b6e388
-SIZE (cabal/extensible-exceptions-0.1.1.4/extensible-exceptions-0.1.1.4.tar.gz) = 8531
 SHA256 (cabal/hsc2hs-0.68.7/hsc2hs-0.68.7.tar.gz) = fd7915e41e3ed3bc7750fee0e8add2b4f32dcac8b7c544cfdf5542293223894a
 SIZE (cabal/hsc2hs-0.68.7/hsc2hs-0.68.7.tar.gz) = 38630
-SHA256 (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = dbaf8bf6b888fb98845705079296a23c3f40ee2f449df7312f7f7f1de18d7b50
-SIZE (cabal/old-locale-1.0.0.7/old-locale-1.0.0.7.tar.gz) = 3384
-SHA256 (cabal/old-locale-1.0.0.7/revision/2.cabal) = fa998be2c7e00cd26a6e9075bea790caaf3932caa3e9497ad69bc20380dd6911
-SIZE (cabal/old-locale-1.0.0.7/revision/2.cabal) = 1071
-SHA256 (cabal/setlocale-1.0.0.9/setlocale-1.0.0.9.tar.gz) = 3bb386f705fc918615b288f55422ce6c14f087ff36e554cbafb9ffab9dea66a1
-SIZE (cabal/setlocale-1.0.0.9/setlocale-1.0.0.9.tar.gz) = 2098
-SHA256 (cabal/setlocale-1.0.0.9/revision/2.cabal) = 948d12fb453100359ea49e7d5bc5897630c269142719d03a2ca05e2d61a71050
-SIZE (cabal/setlocale-1.0.0.9/revision/2.cabal) = 867
-SHA256 (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = fb0b9e3acbe0605bcd1c63e51f290a7bbbe6628dfa3294ff453e4235fbaef140
-SIZE (cabal/utf8-string-1.0.1.1/utf8-string-1.0.1.1.tar.gz) = 8667
-SHA256 (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 68cc6cf665e7212334a51b63d6936daeaca023b2cfe8637d130acfe95f91700b
-SIZE (cabal/utf8-string-1.0.1.1/revision/3.cabal) = 1151
+SHA256 (cabal/hsc2hs-0.68.7/revision/1.cabal) = 4a0f6860a17e7c245646975e3c2981416afdcb6a7b3553c31005eb3641a7f55b
+SIZE (cabal/hsc2hs-0.68.7/revision/1.cabal) = 2794
+SHA256 (cabal/setlocale-1.0.0.10/setlocale-1.0.0.10.tar.gz) = 3972ff10c22318f5451215dc886c1535fea5ab7dfefe5ce461b1603865423ba7
+SIZE (cabal/setlocale-1.0.0.10/setlocale-1.0.0.10.tar.gz) = 2096