diff --git a/games/xmj/Makefile b/games/xmj/Makefile
index cedeb63af51..e13c8cc6503 100644
--- a/games/xmj/Makefile
+++ b/games/xmj/Makefile
@@ -1,23 +1,38 @@
-# $OpenBSD: Makefile,v 1.25 2019/07/12 20:46:27 sthen Exp $
+# $OpenBSD: Makefile,v 1.26 2021/02/05 15:32:06 cwen Exp $
 
 COMMENT=	Mahjongg game for X11
 
-DISTNAME=       xmj
-PKGNAME=	xmj-1.0
-REVISION =	3
+DISTNAME=	mj-1.16-src
+PKGNAME=	x${DISTNAME:S/-src$//}
+
 CATEGORIES=	games
 
-# BSD
+HOMEPAGE=	https://mahjong.julianbradfield.org/
+
+# GPLv2
 PERMIT_PACKAGE=	Yes
 
-WANTLIB=	X11 Xau Xdmcp Xext c xcb
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
+WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
+
+MASTER_SITES=	${HOMEPAGE}/Source/
+
+LIB_DEPENDS=	x11/gtk+2
+
+MAKE_FLAGS+=	CC="${CC}" EXTRA_CFLAGS="${CFLAGS}" CDEBUGFLAGS=
+# The final '/' matters
+FAKE_FLAGS+=	DESTDIR="${WRKINST}${PREFIX}/"
+
+USE_GMAKE=	Yes
 
-CONFIGURE_STYLE=imake noman
 NO_TEST=	Yes
 
-pre-configure:
-	@perl -pi -e 's,_height=,_height ,g;' \
-		-e 's,_width=,_width ,g' $i \
-		${WRKSRC}/tiles/c*
+# base-gcc fix for "c99 initial declarations in for loops" error
+CFLAGS+=	-std=gnu99
+
+INSTALL_TARGET=	install install.man
 
 .include <bsd.port.mk>
diff --git a/games/xmj/distinfo b/games/xmj/distinfo
index 8e65c9ffe06..e4582bcc79c 100644
--- a/games/xmj/distinfo
+++ b/games/xmj/distinfo
@@ -1,2 +1,2 @@
-SHA256 (xmj.tar.gz) = EGcUMVIKBYSp3BJHqnYPM988WHP7G7IVgN//NK7xhyg=
-SIZE (xmj.tar.gz) = 52255
+SHA256 (mj-1.16-src.tar.gz) = wl6YSPSfcGNeXjugy1l5nlvBSalfeGYhuZaWtmeHop0=
+SIZE (mj-1.16-src.tar.gz) = 403981
diff --git a/games/xmj/patches/patch-Imakefile b/games/xmj/patches/patch-Imakefile
deleted file mode 100644
index c31350e9150..00000000000
--- a/games/xmj/patches/patch-Imakefile
+++ /dev/null
@@ -1,9 +0,0 @@
-$OpenBSD: patch-Imakefile,v 1.1 2007/10/27 13:32:05 ajacoutot Exp $
---- Imakefile.orig	Fri May  5 16:46:04 1989
-+++ Imakefile	Sat Oct 27 15:15:14 2007
-@@ -4,4 +4,4 @@ LOCAL_LIBRARIES = $(XLIB)
-            OBJS = bicons.o cicons.o cicons1.o cicons2.o cicons3.o cicons4.o \
- 		  cicons5.o event.o icons.o mj.o nicons.o
- 
--ComplexProgramTarget(xmj)
-+ComplexProgramTargetNoMan(xmj)
diff --git a/games/xmj/patches/patch-event_c b/games/xmj/patches/patch-event_c
deleted file mode 100644
index 7e1993db15e..00000000000
--- a/games/xmj/patches/patch-event_c
+++ /dev/null
@@ -1,11 +0,0 @@
-$OpenBSD: patch-event_c,v 1.1 2017/04/19 22:02:45 espie Exp $
---- event.c.orig	Thu Apr 20 00:00:59 2017
-+++ event.c	Thu Apr 20 00:01:22 2017
-@@ -599,6 +599,7 @@ void board_num_proc()
-     place_tiles(FALSE);
- }
- 
-+void
- msg_event_proc(event)
-     XEvent *event;
- {
diff --git a/games/xmj/pkg/PLIST b/games/xmj/pkg/PLIST
index a139d8663cd..9f1ab81af10 100644
--- a/games/xmj/pkg/PLIST
+++ b/games/xmj/pkg/PLIST
@@ -1,2 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.2 2002/04/07 01:54:49 naddy Exp $
-bin/xmj
+@comment $OpenBSD: PLIST,v 1.3 2021/02/05 15:32:06 cwen Exp $
+@bin bin/mj-player
+@bin bin/mj-server
+@bin bin/xmj
+@man man/man1/mj-player.1
+@man man/man1/mj-server.1
+@man man/man1/xmj.1