diff --git a/x11-wm/spectrwm/Makefile b/x11-wm/spectrwm/Makefile
index 828358d25f0a..df5772fb9bcf 100644
--- a/x11-wm/spectrwm/Makefile
+++ b/x11-wm/spectrwm/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spectrwm
-PORTVERSION=	1.0.0
+PORTVERSION=	1.1.1
 CATEGORIES=	x11-wm
 MASTER_SITES=	https://opensource.conformal.com/snapshots/${PORTNAME}/
 EXTRACT_SUFX=	.tgz
@@ -16,14 +16,15 @@ COMMENT=	A small, dynamic tiling window manager for X11
 
 LICENSE=	ISCL
 
-OPTIONS=	DMENU_BOTTOM "dmenu at screen bottom (instead of top)" Off
+OPTIONS_DEFINE=	DMENU_BOTTOM
+DMENU_BOTTOM_DESC=	dmenu at screen bottom (instead of top)
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 USE_XORG=	x11 xproto xrandr xt xtst
 
 MAN1=		spectrwm.1
-USE_LDCONFIG=yes
+USE_LDCONFIG=	yes
 PORTEXAMPLES=	spectrwm_cz.conf \
 		spectrwm_es.conf \
 		spectrwm_fr.conf \
@@ -33,7 +34,7 @@ PORTEXAMPLES=	spectrwm_cz.conf \
 
 RUN_DEPENDS+=	dmenu:${PORTSDIR}/x11/dmenu
 
-.if defined(WITH_DMENU_BOTTOM)
+.if ${PORT_OPTIONS:MDMENU_BOTTOM}
 EXTRA_PATCHES+=	${FILESDIR}/spawn_menu_atbottom.patch
 .endif
 
@@ -64,4 +65,4 @@ do-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-wm/spectrwm/distinfo b/x11-wm/spectrwm/distinfo
index b962cce2165b..1aa54e3d4beb 100644
--- a/x11-wm/spectrwm/distinfo
+++ b/x11-wm/spectrwm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spectrwm-1.0.0.tgz) = 4cfd7ed7c61fdfc8c108e5efec4513ee14b32baa8d2b095465c62e7bfdd65998
-SIZE (spectrwm-1.0.0.tgz) = 88112
+SHA256 (spectrwm-1.1.1.tgz) = 36daf5fb55d8215abbd64a3f98681a5c6a4a9141d08ec5efc57e33786619357f
+SIZE (spectrwm-1.1.1.tgz) = 93045
diff --git a/x11-wm/spectrwm/files/startscrotwm b/x11-wm/spectrwm/files/startscrotwm
deleted file mode 100644
index 34721b34da5b..000000000000
--- a/x11-wm/spectrwm/files/startscrotwm
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ -z "${DISPLAY}" ]
-then
-	echo "$0: Starting X server"
-	exec xinit $( which scrotwm )
-else
-	echo "$0: X server already running on display ${DISPLAY}"
-	$( which scrotwm )
-fi