diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index 32cff10bf870..23835721a76c 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -1,88 +1,93 @@
 # Created by: Mark Murray <markm@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	bsdgames
-PORTVERSION=	3.8.2
-PORTREVISION=	4
+PORTVERSION=	4.0.5
 PORTEPOCH=	1
 CATEGORIES=	games
-# Fetched from git://git.dragonflybsd.org/dragonfly.git, v${PORTVERSION}, /games
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	adamw
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Traditional BSD games taken from DragonFly BSD
 
 LICENSE=	BSD3CLAUSE
 
 CONFLICTS=	hangman-[0-9]*
 
 USES=		uidfix tar:xz
 MAKE_ENV+=	NO_WERROR=1
 MAKE_ARGS=	BINGRP=${BINGRP}
 
 # contain /usr/share/games
 SHAREPATH_FILES=atc/atc.6 \
 		atc/pathnames.h \
 		cribbage/cribbage.6 \
 		cribbage/pathnames.h \
 		fish/pathnames.h \
 		larn/pathnames.h \
 		quiz/datfiles/index \
 		quiz/pathnames.h \
 		quiz/quiz.6 \
 		wump/pathnames.h
 
 # contain /usr/games/*
 GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \
 		backgammon/common_source/init.c \
 		canfield/canfield/canfield.6 \
 		cribbage/cribbage.6 \
 		hunt/hunt/hunt.6 \
 		hunt/huntd/huntd.6 \
 		phantasia/pathnames.h \
 		wargames/wargames.sh
 
 # These keep score in /var/games
 SGID_BINARIES=	atc battlestar canfield/canfield cribbage hack phantasia \
 		robots sail snake/snake
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/NOMAN/NO_MAN/" \
 		${WRKSRC}/backgammon/teachgammon/Makefile \
 		${WRKSRC}/canfield/cfscores/Makefile \
 		${WRKSRC}/snake/snscore/Makefile \
 		${WRKSRC}/fortune/unstr/Makefile \
 		${WRKSRC}/primes/Makefile
 	@for f in ${SHAREPATH_FILES}; do \
 		${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \
 			${WRKSRC}/$${f}; \
 	done
 	@for f in ${GAMESPATH_FILES}; do \
 		${REINPLACE_CMD} -e 's|/usr/games|${PREFIX}/bin|g' \
 			${WRKSRC}/$${f}; \
 	done
 	@for f in ${SGID_BINARIES}; do \
 		${REINPLACE_CMD} -e 's/HIDEGAME/SGIDGAME/' \
 			${WRKSRC}/$${f}/Makefile; \
 	done
 
 pre-install:
 .for d in atc larn quiz.db
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/games/$d
 .endfor
 .for d in atc battlestar hackdir/save larn phantasia
 	@${MKDIR} ${STAGEDIR}/var/games/$d
 .endfor
 
 post-install:
 # avoid conflict with games/bs and shells/fish
 .for prog in bs fish
 	${MV} ${STAGEDIR}${PREFIX}/bin/${prog} ${STAGEDIR}${PREFIX}/bin/${prog}-game
 	${MV} ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}.6.gz ${STAGEDIR}${MAN6PREFIX}/man/man6/${prog}-game.6.gz
 .endfor
 
 	@${TOUCH} ${STAGEDIR}/var/games/atc_score
 	@${FIND} ${STAGEDIR}/var/games -type f -exec ${MV} {} {}.sample \;
 
+dist:
+	fetch -o- https://github.com/DragonFlyBSD/DragonFlyBSD/archive/v${PORTVERSION}.zip | \
+		unzip - DragonFlyBSD-${PORTVERSION}/games/\*
+	mv DragonFlyBSD-${PORTVERSION}/games bsdgames-${PORTVERSION}
+	tar -cvf bsdgames-${PORTVERSION}.tar bsdgames-${PORTVERSION}
+	xz -v bsdgames-${PORTVERSION}.tar
+
 .include <bsd.port.mk>
diff --git a/games/bsdgames/distinfo b/games/bsdgames/distinfo
index 7c22156e6ea6..074b6936a576 100644
--- a/games/bsdgames/distinfo
+++ b/games/bsdgames/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bsdgames-3.8.2.tar.xz) = f24b7202c06af3ee2d5b4492970003a25bb93ad9eba9ffc68b187bc213eb536b
-SIZE (bsdgames-3.8.2.tar.xz) = 1750472
+SHA256 (bsdgames-4.0.5.tar.xz) = 3511d7af6784bf4377f5ebfeae2d1fe502f5b5fd3e649f1224b414db2267d310
+SIZE (bsdgames-4.0.5.tar.xz) = 1751992