diff --git a/x11-wm/hs-xmonad/Makefile b/x11-wm/hs-xmonad/Makefile
index 7507c53167f3..1c10073ef331 100644
--- a/x11-wm/hs-xmonad/Makefile
+++ b/x11-wm/hs-xmonad/Makefile
@@ -1,36 +1,31 @@
 PORTNAME=	xmonad
-PORTVERSION=	0.18.0
-PORTREVISION=	1
+DISTVERSION=	0.18.1
 CATEGORIES=	x11-wm haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	Tiling window manager
-WWW=		https://xmonad.org/
+WWW=		https://xmonad.org/ \
+		https://github.com/xmonad/xmonad/
 
 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.10.3_1 \
-		data-default-0.8.0.1 \
-		data-default-class-0.2.0.0 \
-		hsc2hs-0.68.10_4 \
-		setlocale-1.0.0.10_7
+PIE_UNSAFE=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${STAGEDIR}${PREFIX}/share/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
+	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/man/xmonad.hs ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_SCRIPT} ${FILESDIR}/example_buildscript ${STAGEDIR}${EXAMPLESDIR}/build
+	${INSTALL_DATA} ${FILESDIR}/example_config.cabal ${STAGEDIR}${EXAMPLESDIR}/xmonad-config.cabal
 
 .include <bsd.port.mk>
diff --git a/x11-wm/hs-xmonad/Makefile.cabal b/x11-wm/hs-xmonad/Makefile.cabal
new file mode 100644
index 000000000000..daa132ad028e
--- /dev/null
+++ b/x11-wm/hs-xmonad/Makefile.cabal
@@ -0,0 +1,5 @@
+USE_CABAL=	X11-1.10.3_1 \
+		data-default-0.8.0.2 \
+		data-default-class-0.2.0.0 \
+		hsc2hs-0.68.10_5 \
+		setlocale-1.0.0.10_7
diff --git a/x11-wm/hs-xmonad/distinfo b/x11-wm/hs-xmonad/distinfo
index d90e5312e115..cdb4b58466de 100644
--- a/x11-wm/hs-xmonad/distinfo
+++ b/x11-wm/hs-xmonad/distinfo
@@ -1,19 +1,19 @@
-TIMESTAMP = 1766771281
-SHA256 (cabal/xmonad-0.18.0/xmonad-0.18.0.tar.gz) = 21e80e847db2ee183d07d50acd57a5b24397bbf60806492d30818a3ea7ec5dfb
-SIZE (cabal/xmonad-0.18.0/xmonad-0.18.0.tar.gz) = 97078
+TIMESTAMP = 1774191300
+SHA256 (cabal/xmonad-0.18.1/xmonad-0.18.1.tar.gz) = 988b5f3104ac03aa078248afea7efcaed86661dfb239efd44995f58cd4f7a1f0
+SIZE (cabal/xmonad-0.18.1/xmonad-0.18.1.tar.gz) = 99352
 SHA256 (cabal/X11-1.10.3/X11-1.10.3.tar.gz) = d84ad1b8f5cdb65a0de17f84d765ebbb7aeeab9608c3740804da28100616d242
 SIZE (cabal/X11-1.10.3/X11-1.10.3.tar.gz) = 192921
 SHA256 (cabal/X11-1.10.3/revision/1.cabal) = 0d1dfe1034a3bbed5cd5657b7d825b07e4a01d6efe75e118e082f5650a46af00
 SIZE (cabal/X11-1.10.3/revision/1.cabal) = 3869
-SHA256 (cabal/data-default-0.8.0.1/data-default-0.8.0.1.tar.gz) = ce085de8ec2196f0c1d30af0ad8a517d5737c9edfd4ebfbb49e8687dfc40b6ca
-SIZE (cabal/data-default-0.8.0.1/data-default-0.8.0.1.tar.gz) = 5821
+SHA256 (cabal/data-default-0.8.0.2/data-default-0.8.0.2.tar.gz) = fa7d5de70ccef7381a7f17cd64948de1c24b620de13e1cd55c36c26949870799
+SIZE (cabal/data-default-0.8.0.2/data-default-0.8.0.2.tar.gz) = 6138
 SHA256 (cabal/data-default-class-0.2.0.0/data-default-class-0.2.0.0.tar.gz) = 0ae530c4fb0bd6c8a8ba399429ccd9c75f9c7696049117178f4ceeb2bd08d5b4
 SIZE (cabal/data-default-class-0.2.0.0/data-default-class-0.2.0.0.tar.gz) = 1589
 SHA256 (cabal/hsc2hs-0.68.10/hsc2hs-0.68.10.tar.gz) = 6f4e34d788fe2ca7091ee0a10307ee8a7c060a1ba890f2bffad16a7d4d5cef76
 SIZE (cabal/hsc2hs-0.68.10/hsc2hs-0.68.10.tar.gz) = 40517
-SHA256 (cabal/hsc2hs-0.68.10/revision/4.cabal) = 725ef6da03d3d6e332db4de0a35bee45d72e4d31decc5ec7f153e6837af5f03e
-SIZE (cabal/hsc2hs-0.68.10/revision/4.cabal) = 3114
+SHA256 (cabal/hsc2hs-0.68.10/revision/5.cabal) = 39b25fd929b02b01a3fe59fec7ca8b2da6f0f9e282276b7a84e63a4702c4d725
+SIZE (cabal/hsc2hs-0.68.10/revision/5.cabal) = 3131
 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
 SHA256 (cabal/setlocale-1.0.0.10/revision/7.cabal) = 8ae0283824243e284549d6202084689c4ec5d80ad766484d25b537b30a11bb56
 SIZE (cabal/setlocale-1.0.0.10/revision/7.cabal) = 869