diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 34d3549d703c..6e0b2500f030 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,25 +1,35 @@
 PORTNAME=	yasm
-PORTVERSION=	1.3.0
-PORTREVISION=	1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.3.0-90
+DISTVERSIONSUFFIX=	-ga2f8bdf0
 CATEGORIES=	devel lang
-MASTER_SITES=	https://www.tortall.net/projects/yasm/releases/
+#MASTER_SITES=	https://www.tortall.net/projects/yasm/releases/
 
 MAINTAINER=	johnson.peter@gmail.com
 COMMENT=	Complete rewrite of the NASM assembler
 WWW=		https://yasm.tortall.net/
 
 LICENSE=	BSD3CLAUSE
 
+USES=		cmake:testing localbase:ldflags
+
+USE_GITHUB=	yes
+
+CMAKE_OFF=	YASM_BUILD_TESTS
+CMAKE_TESTING_ON=	YASM_BUILD_TESTS # inclear how to run tests, see https://github.com/yasm/yasm/issues/212
+
 OPTIONS_DEFINE=	NLS
 
-GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
-CONFIGURE_ARGS+=--disable-python --disable-python-bindings
-CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-NLS_USES=	gettext iconv
-NLS_CONFIGURE_OFF=--disable-nls --without-libiconv-prefix --without-libintl-prefix
+NLS_CMAKE_BOOL=	ENABLE_NLS
+
+NLS_USES=	gettext-runtime
+NLS_LDFLAGS=	-lintl
 
-INSTALL_TARGET=	install install-man
+post-install:
+	# install manpages
+	${INSTALL_MAN} ${WRKSRC}/yasm.1 ${STAGEDIR}${PREFIX}/share/man/man1
+.for m in yasm_arch yasm_dbgfmts yasm_objfmts yasm_parsers
+	${INSTALL_MAN} ${WRKSRC}/${m}.7 ${STAGEDIR}${PREFIX}/share/man/man7
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/yasm/distinfo b/devel/yasm/distinfo
index 3035c9d5fedb..11ca721188eb 100644
--- a/devel/yasm/distinfo
+++ b/devel/yasm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464339461
-SHA256 (yasm-1.3.0.tar.gz) = 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
-SIZE (yasm-1.3.0.tar.gz) = 1492156
+TIMESTAMP = 1776757044
+SHA256 (yasm-yasm-v1.3.0-90-ga2f8bdf0_GH0.tar.gz) = aacfbd63a8e9a4469f40dd9d214cbdfd71e74b46ef46033f502e26dd8b644f30
+SIZE (yasm-yasm-v1.3.0-90-ga2f8bdf0_GH0.tar.gz) = 1404682
diff --git a/devel/yasm/pkg-plist b/devel/yasm/pkg-plist
index 1f31196ae90e..241ab8769b16 100644
--- a/devel/yasm/pkg-plist
+++ b/devel/yasm/pkg-plist
@@ -1,38 +1,39 @@
-bin/yasm
 bin/vsyasm
+bin/yasm
 bin/ytasm
-include/libyasm.h
 include/libyasm-stdint.h
+include/libyasm.h
 include/libyasm/arch.h
 include/libyasm/assocdat.h
 include/libyasm/bitvect.h
 include/libyasm/bytecode.h
 include/libyasm/compat-queue.h
 include/libyasm/coretype.h
 include/libyasm/dbgfmt.h
 include/libyasm/errwarn.h
 include/libyasm/expr.h
 include/libyasm/file.h
 include/libyasm/floatnum.h
 include/libyasm/hamt.h
 include/libyasm/insn.h
 include/libyasm/intnum.h
 include/libyasm/inttree.h
 include/libyasm/linemap.h
 include/libyasm/listfmt.h
 include/libyasm/md5.h
 include/libyasm/module.h
 include/libyasm/objfmt.h
 include/libyasm/parser.h
 include/libyasm/phash.h
 include/libyasm/preproc.h
 include/libyasm/section.h
 include/libyasm/symrec.h
 include/libyasm/valparam.h
 include/libyasm/value.h
-lib/libyasm.a
+lib/libyasm.so
+lib/libyasmstd.so
 share/man/man1/yasm.1.gz
 share/man/man7/yasm_arch.7.gz
 share/man/man7/yasm_dbgfmts.7.gz
 share/man/man7/yasm_objfmts.7.gz
 share/man/man7/yasm_parsers.7.gz