diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile
index cd349f714357..301fe34b1b95 100644
--- a/misc/wmweather+/Makefile
+++ b/misc/wmweather+/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	wmweather+
-PORTVERSION=	2.17
-PORTREVISION=	1
+PORTVERSION=	2.18
 CATEGORIES=	misc windowmaker geography
 MASTER_SITES=	SF/wmweatherplus/wmweather%2B/ \
 		SF/nemysisfreebsdp/misc/:icons
@@ -22,9 +21,8 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libtiff.so:graphics/tiff \
 		libHermes.so:graphics/Hermes \
 		libpng.so:graphics/png \
-		libgif.so:graphics/giflib
-
-WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
+		libgif.so:graphics/giflib \
+		libwraster.so:x11-wm/libwraster
 
 USES=		iconv jpeg xorg
 GNU_CONFIGURE=	yes
@@ -36,6 +34,8 @@ CONFIGURE_ARGS=	--with-libwraster=${LOCALBASE} \
 USE_XORG=	x11 xext xpm sm ice
 LDFLAGS+=	-lm
 
+WRKSRC=		${WRKDIR}/wmweather+-${PORTVERSION}
+
 SUB_FILES=	pkg-message
 
 PLIST_FILES=	bin/${PORTNAME} \
@@ -52,7 +52,6 @@ OPTIONS_DEFINE=	DOCS EXAMPLES WM
 WM_DESC=	Depend on Window Maker port (otherwise only libwraster)
 
 WM_LIB_DEPENDS=		libWMaker.so:x11-wm/windowmaker
-WM_LIB_DEPENDS_OFF=	libwraster.so:x11-wm/libwraster
 
 post-patch:
 	@${REINPLACE_CMD} \
@@ -63,7 +62,7 @@ post-patch:
 	@${REINPLACE_CMD} \
 		-e 's|http://www.nws.noaa.gov/tg/siteloc.shtml|http://www.nws.noaa.gov/tg/siteloc.php|' \
 		-e 's|/etc/wmweather+.conf|${PREFIX}/etc/wmweather+.conf|' \
-		${WRKSRC}/${PORTNAME}.1.in
+		${WRKSRC}/${PORTNAME}.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
diff --git a/misc/wmweather+/distinfo b/misc/wmweather+/distinfo
index bbfe1bcbd5ea..4040f73058ca 100644
--- a/misc/wmweather+/distinfo
+++ b/misc/wmweather+/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1516689652
-SHA256 (wmweather+-2.17.tar.gz) = f547b7df482e086e8c917b69261595be2a73f39793e28826678ece96c07cc127
-SIZE (wmweather+-2.17.tar.gz) = 212763
+TIMESTAMP = 1587808570
+SHA256 (wmweather+-2.18.tar.gz) = c0ca451aa8cd9f4fb7701e393b7288b56fb8cb358737481a9472949909194b6d
+SIZE (wmweather+-2.18.tar.gz) = 206062
 SHA256 (wmweather+.png) = 4330af568e7b460882c6afeee9aadd2b71ec01cbbdc649819b96d049be48288b
 SIZE (wmweather+.png) = 5730