diff --git a/x11-wm/vtwm/Makefile b/x11-wm/vtwm/Makefile
index eb6f2704d5fd..478f531690e3 100644
--- a/x11-wm/vtwm/Makefile
+++ b/x11-wm/vtwm/Makefile
@@ -1,38 +1,35 @@
 # Created by: Bruce A. Mah <bmah@ca.sandia.gov>
 # $FreeBSD$
 
 PORTNAME=	vtwm
-PORTVERSION=	5.4.99.20130906
-PORTREVISION=	1
+PORTVERSION=	5.5.0
 CATEGORIES=	x11-wm
-MASTER_SITES=	https://aklv.github.io/distfiles/
+MASTER_SITES=	SF/${PORTNAME}
 
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Twm with a virtual desktop and optional Motif-like features
 
 LICENSE=	MIT
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
-USES=	pkgconfig tar:xz
+USES=	pkgconfig
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xft xinerama xpm xmu xrandr
 
-WRKSRC=	${WRKDIR}/vtwm-20130906
-
 PLIST_FILES=	bin/vtwm \
 		bin/nexpm \
 		etc/system.vtwmrc \
 		man/man1/vtwm.1.gz
 
 OPTIONS_DEFINE=	SOUND
 SOUND_DESC=	Sound support (via rplay)
 
 SOUND_CONFIGURE_ENABLE=	sound
 SOUND_LIB_DEPENDS=	librplay.so:audio/rplay
 
 pre-patch:
 	@${REINPLACE_CMD} -e 's|\$${datadir}/X11/vtwm|\$${prefix}/etc|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11-wm/vtwm/distinfo b/x11-wm/vtwm/distinfo
index 6dc199d7f4f5..35c64d14442d 100644
--- a/x11-wm/vtwm/distinfo
+++ b/x11-wm/vtwm/distinfo
@@ -1,2 +1,3 @@
-SHA256 (vtwm-5.4.99.20130906.tar.xz) = 90a9edc39bc5b43ae22d1eb3dfaf8890ad501fe79be5aabb8bb5476e4cfe08d9
-SIZE (vtwm-5.4.99.20130906.tar.xz) = 963540
+TIMESTAMP = 1538200550
+SHA256 (vtwm-5.5.0.tar.gz) = 448d7afd8d5a5fcfabf1b9c64b811cfa6bdbf8892c067fe01a141806ef61eaf4
+SIZE (vtwm-5.5.0.tar.gz) = 1141664