diff --git a/emulators/yaze-ag/Makefile b/emulators/yaze-ag/Makefile
index 67489c5ac711..939f861f6490 100644
--- a/emulators/yaze-ag/Makefile
+++ b/emulators/yaze-ag/Makefile
@@ -1,37 +1,38 @@
 PORTNAME=	yaze-ag
 DISTVERSION=	2.51.0
+PORTREVISION=	1
 CATEGORIES=	emulators
 MASTER_SITES=	http://www.mathematik.uni-ulm.de/users/ag/yaze-ag/devel/
 
 MAINTAINER=	se@FreeBSD.org
 COMMENT=	Z80 and CP/M-80 emulator
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libreadline.so:devel/readline
 
 USES=		compiler:c11
 
-CONFLICTS_INSTALL=	cpmtools
-
 MAKEFILE=	Makefile_freebsd
 MAKE_ENV=	BINDIR=${PREFIX}/bin \
 		DESTDIR="${STAGEDIR}" \
 		DOCDIR=${DOCSDIR} \
 		DOCHTMLDIR=${DOCSDIR}/html \
 		DSKDIR=${DATADIR}/disks \
 		LIBDIR=${DATADIR} \
 		LIBEXECDIR=${PREFIX}/libexec \
 		MANDIR=${MAN1PREFIX}/man/man1 \
 		OPTIMIZE="${CFLAGS}"
 
+CONFLICTS_INSTALL=	cpmtools
+
 OPTIONS_DEFINE=	DOCS
 
 post-build:
 		${REINPLACE_CMD} -e 's:%%DATADIR%%:${DATADIR}:' \
 				 -e 's:%%DOCSDIR%%:${DOCSDIR}:' \
 				 -e 's:%%LIBEXECDIR%%:${PREFIX}/libexec:' \
 							${WRKSRC}/yaze.sh
 
 .include <bsd.port.mk>
diff --git a/emulators/yaze-ag/files/patch-Makefile__freebsd b/emulators/yaze-ag/files/patch-Makefile__freebsd
index bc31e1ce3328..b70057f7bc78 100644
--- a/emulators/yaze-ag/files/patch-Makefile__freebsd
+++ b/emulators/yaze-ag/files/patch-Makefile__freebsd
@@ -1,73 +1,83 @@
 --- Makefile_freebsd.orig	2021-05-11 19:11:02 UTC
 +++ Makefile_freebsd
 @@ -6,12 +6,12 @@ BUILD = " (build for AMD (barcelona, 64Bit))"
  CC            =	clang
  
  #where you want the binaries and manual page
 -BINDIR	      = /usr/local/bin
 -MANDIR	      = /usr/local/man/man1
 -LIBDIR	      = /usr/local/lib/yaze
 -DSKDIR        = $(LIBDIR)/disks
 -DOCDIR        = $(LIBDIR)/doc
 -DOCHTMLDIR    = $(LIBDIR)/doc_html
 +#BINDIR	      = $(PREFIX)/bin
 +#MANDIR	      = $(PREFIX)/man/man1
 +#LIBDIR	      = $(PREFIX)/share/yaze-ag
 +#DSKDIR        = $(LIBDIR)/disks
 +#DOCDIR        = $(PREFIX)/share/doc/yaze-ag
 +#DOCHTMLDIR    = $(DOCDIR)/html
  
  #OPTIMIZE	= -g -m486
  #OPTIMIZE	= -g -save-temps -m486
-@@ -210,29 +210,29 @@ cdm:		cdm.o
+@@ -59,7 +59,8 @@ DOCHTMLDIR    = $(LIBDIR)/doc_html
+ #OPTIMIZE	= -O3 -march=athlon64	# 64 Bit AMD
+ #OPTIMIZE	= -O3 -march=athlon64-sse3
+ #OPTIMIZE	= -O3 -march=barcelona
+-OPTIMIZE	= -O3 -march=x86-64
++#OPTIMIZE	= -O3 -march=x86-64
++OPTIMIZE	= -O3
+ 
+ # -DUSE_GNU_READLINE for command recall/editing and filename completion
+ # -DBGii_BUG works around a problem in Backgrounder II
+@@ -210,29 +211,29 @@ install:	all
  		$(CC) $(CFLAGS) cdm.o $(LIBS) -o $@
  
  install:	all
 -		rm -rf $(LIBDIR)
 -		mkdir -p $(LIBDIR)
 -		mkdir -p $(MANDIR)
 -		$(INSTALL) -s -c -m 755 yaze_bin $(BINDIR)
 -		$(INSTALL) -s -c -m 755 cdm $(BINDIR)
 -		$(INSTALL) -c -m 755 yaze $(BINDIR)
 -		ln -f -s $(BINDIR)/yaze $(BINDIR)/cpm
 -		ln -f -s $(BINDIR)/yaze $(BINDIR)/z80
 -		$(INSTALL) -c -m 644 yaze-cpm3.boot $(LIBDIR)
 -		$(INSTALL) -c -m 644 yaze.boot $(LIBDIR)
 -		$(INSTALL) -c -m 644 m2.ktt $(LIBDIR)
 -		$(INSTALL) -c -m 644 sample.ktt $(LIBDIR)
 -		$(INSTALL) -c -m 644 yaze.ktt $(LIBDIR)
 -		$(INSTALL) -c -m 644 yaze.1 $(MANDIR)
 -		$(INSTALL) -c -m 644 cdm.1 $(MANDIR)
 -		$(INSTALL) -c -m 644 cpm.1 $(MANDIR)
 -		$(INSTALL) -c -m 644 z80.1 $(MANDIR)
 -		/bin/sh install_disks.sh $(DSKDIR)
 -		/bin/sh install_doc.sh $(DOCDIR)
 -		/bin/sh install_doc_html.sh $(DOCHTMLDIR)
 -		(cd $(LIBDIR); \
 +		rm -rf $(DESTDIR)$(LIBDIR)
 +		mkdir -p $(DESTDIR)$(LIBDIR)
 +		mkdir -p $(DESTDIR)$(MANDIR)
 +		$(INSTALL) -s -c -m 755 yaze_bin $(DESTDIR)$(LIBEXECDIR)
 +		$(INSTALL) -s -c -m 755 cdm $(DESTDIR)$(BINDIR)
 +		$(INSTALL) -c -m 755 yaze $(DESTDIR)$(BINDIR)
 +		ln -f -s yaze $(DESTDIR)$(BINDIR)/cpm
 +		ln -f -s yaze $(DESTDIR)$(BINDIR)/z80
 +		$(INSTALL) -c -m 644 yaze-cpm3.boot $(DESTDIR)$(LIBDIR)
 +		$(INSTALL) -c -m 644 yaze.boot $(DESTDIR)$(LIBDIR)
 +		$(INSTALL) -c -m 644 m2.ktt $(DESTDIR)$(LIBDIR)
 +		$(INSTALL) -c -m 644 sample.ktt $(DESTDIR)$(LIBDIR)
 +		$(INSTALL) -c -m 644 yaze.ktt $(DESTDIR)$(LIBDIR)
 +		$(INSTALL) -c -m 644 yaze.1 $(DESTDIR)$(MANDIR)
 +		$(INSTALL) -c -m 644 cdm.1 $(DESTDIR)$(MANDIR)
 +		$(INSTALL) -c -m 644 cpm.1 $(DESTDIR)$(MANDIR)
 +		$(INSTALL) -c -m 644 z80.1 $(DESTDIR)$(MANDIR)
 +		/bin/sh install_disks.sh $(DESTDIR)$(DSKDIR)
 +		/bin/sh install_doc.sh $(DESTDIR)$(DOCDIR)
 +		/bin/sh install_doc_html.sh $(DESTDIR)$(DOCHTMLDIR)
 +		(cd $(DESTDIR)$(LIBDIR); \
  		rm -f md5 /tmp/md5.yaze-ag; \
 -		find . -type f -exec md5sum -b {} >>/tmp/md5.yaze-ag \; ; \
 +		find * -type f -exec md5 -r {} >>/tmp/md5.yaze-ag \; ; \
  		mv /tmp/md5.yaze-ag md5)
  
  md5:		$(DISTRIB)