diff --git a/emulators/advancemess/Makefile b/emulators/advancemess/Makefile
index 2dcb23b4291..d6fb4152768 100644
--- a/emulators/advancemess/Makefile
+++ b/emulators/advancemess/Makefile
@@ -1,8 +1,10 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2016/09/08 20:28:18 fcambus Exp $
+# $OpenBSD: Makefile,v 1.2 2016/12/16 21:24:54 fcambus Exp $
 
 COMMENT =	MESS port with advanced video support for monitors and TVs
 
-DISTNAME =	advancemess-1.4
+V =             3.0
+DISTNAME =      advancemame-$V
+PKGNAME =       advancemess-$V
 
 CATEGORIES =	emulators games
 
@@ -17,12 +19,14 @@ PERMIT_DISTFILES_FTP =	unclear license
 
 WANTLIB +=	SDL c expat freetype m pthread z
 
-MASTER_SITES =	https://github.com/amadvance/advancemame/releases/download/${DISTNAME}/
+MASTER_SITES =	https://github.com/amadvance/advancemame/releases/download/v$V/
 
 LIB_DEPENDS =	devel/sdl
 
 CONFIGURE_STYLE = gnu
 
+CONFIGURE_ARGS += --with-emu=mess
+
 USE_GMAKE =	Yes
 
 post-patch:
diff --git a/emulators/advancemess/distinfo b/emulators/advancemess/distinfo
index 967aa13bf0c..bbb067b3fe3 100644
--- a/emulators/advancemess/distinfo
+++ b/emulators/advancemess/distinfo
@@ -1,2 +1,2 @@
-SHA256 (advancemess-1.4.tar.gz) = DXilYHWt64/8FxYgXhle5OAF2HmQZ4WNOYpOd1AVHQA=
-SIZE (advancemess-1.4.tar.gz) = 9288257
+SHA256 (advancemame-3.0.tar.gz) = GQd/Vatjasjplth3daHrhsLO04HLzVfB4MC/QQ9LQQE=
+SIZE (advancemame-3.0.tar.gz) = 23432477