diff --git a/games/bsdgames/Makefile b/games/bsdgames/Makefile
index b24c2ccabf28..1ed3cb3b6466 100644
--- a/games/bsdgames/Makefile
+++ b/games/bsdgames/Makefile
@@ -2,22 +2,20 @@
 # $FreeBSD$
 
 PORTNAME=	bsdgames
-PORTVERSION=	5.5.0
+PORTVERSION=	0.7
 DISTVERSIONPREFIX=	v
-PORTEPOCH=	1
+PORTEPOCH=	2
 CATEGORIES=	games
-MASTER_SITES=	https://deb.debian.org/debian/pool/main/b/bsdgames/:deb
-DISTFILES=	${PORTNAME}_2.17.orig.tar.gz:deb
 
 MAINTAINER=	jockl@pianojockl.org
-COMMENT=	Traditional BSD games taken from DragonFly BSD
+COMMENT=	Traditional BSD games taken mostly from DragonFly BSD
 
 LICENSE=	BSD3CLAUSE
 
 USES=		ncurses tar:xz uidfix
-USE_GITHUB=	nodefault
-GH_ACCOUNT=	DragonFlyBSD:bsd
-GH_PROJECT=	DragonFlyBSD:bsd
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	pianojockl
 
 CONFLICTS=	hangman-[0-9]*
 
@@ -48,11 +46,6 @@ GAMESPATH_FILES=backgammon/backgammon/backgammon.6 \
 		phantasia/pathnames.h \
 		wargames/wargames.sh
 
-post-extract:
-	${MV} ${WRKSRC_bsd}/games  ${WRKSRC}
-	${MV} ${WRKDIR}/bsd-games-2.17/sail/*.[ch] ${WRKSRC}/sail/
-	${MV} ${WRKDIR}/bsd-games-2.17/sail/pathnames.h.in ${WRKSRC}/sail/pathnames.h
-
 post-patch:
 	@for f in ${SHAREPATH_FILES}; do \
 		${REINPLACE_CMD} -e 's|/usr/share/games|${PREFIX}/share/games|g' \
diff --git a/games/bsdgames/distinfo b/games/bsdgames/distinfo
index 6bf536d1f2bb..ecab8ca3f2e1 100644
--- a/games/bsdgames/distinfo
+++ b/games/bsdgames/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1557603153
-SHA256 (bsdgames_2.17.orig.tar.gz) = 066f924aef6c1c5ea946f588e36f303021f5dfc093944738f025d8edbc6fff60
-SIZE (bsdgames_2.17.orig.tar.gz) = 2563311
-SHA256 (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = e54ca3fea6e4ae4b384df4718f5ca749e597537112f1b2170e8fb5c296c1720b
-SIZE (DragonFlyBSD-DragonFlyBSD-v5.5.0_GH0.tar.gz) = 137084047
+TIMESTAMP = 1574784789
+SHA256 (pianojockl-bsdgames-v0.7_GH0.tar.gz) = f79dec751ac78cfef5f80453e6c771052eaa9e9e55ab779799b78a82b6e004fc
+SIZE (pianojockl-bsdgames-v0.7_GH0.tar.gz) = 2349706
diff --git a/games/bsdgames/files/patch-Makefile.inc b/games/bsdgames/files/patch-Makefile.inc
index bfc9041ce92c..cdef802de91e 100644
--- a/games/bsdgames/files/patch-Makefile.inc
+++ b/games/bsdgames/files/patch-Makefile.inc
@@ -1,14 +1,14 @@
---- Makefile.inc.orig	2018-06-15 14:40:00 UTC
+--- Makefile.inc.orig	2018-11-23 03:38:50 UTC
 +++ Makefile.inc
 @@ -1,19 +1,16 @@
  #	@(#)Makefile.inc	8.1 (Berkeley) 5/31/93
  # $FreeBSD: src/games/Makefile.inc,v 1.10.2.2 2002/02/18 16:02:39 ru Exp $
--
++# $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $
+ 
 -BINDIR?=	/usr/games
 -FILESDIR?=	${SHAREDIR}/games
 -WARNS?=		6
-+# $DragonFly: src/games/Makefile.inc,v 1.3 2006/10/08 16:22:34 pavalos Exp $
- 
+-
  # These games write to /var/games/
  .if defined(VARGAMES)
  BINGRP=		games
diff --git a/games/bsdgames/pkg-descr b/games/bsdgames/pkg-descr
index c9d5ac6ccdb2..9e50ee30dd65 100644
--- a/games/bsdgames/pkg-descr
+++ b/games/bsdgames/pkg-descr
@@ -1,4 +1,4 @@
 This is a port of the BSD "standard" games from Dragonfly BSD which
 includes many improvements and cleanups from NetBSD and OpenBSD.
-Sail is pulled from NetBSD sources, since the Dragonfly version 
+Sail is pulled from NetBSD sources, since the Dragonfly version
 wasn't working.