diff --git a/audio/cheesecutter/Makefile b/audio/cheesecutter/Makefile
index bfecc3c9b45e..9614669dd114 100644
--- a/audio/cheesecutter/Makefile
+++ b/audio/cheesecutter/Makefile
@@ -1,40 +1,45 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	cheesecutter
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9-beta-3-25
 DISTVERSIONSUFFIX=	-gdbe9a9d
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Tracker for composing music for the C64 SID chip
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BROKEN_FreeBSD_14=	ld: error: undefined hidden symbol: __start___minfo
-
 BUILD_DEPENDS=	acme:devel/acme \
 		ldc2:lang/ldc
 
 USES=		desktop-file-utils gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	ehaupt
 GH_PROJECT=	CheeseCutter
 
 MAKEFILE=	Makefile.ldc
 MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-install:
 	${MKDIR} ${STAGEDIR}${MANPREFIX}/share/man/fr/man1 ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/arch/fd/ccutter.desktop ${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icons/cc96.png ${STAGEDIR}${PREFIX}/share/pixmaps/${PORTNAME}.png
 .for f in ccutter ct2util
 	${INSTALL_MAN} ${WRKSRC}/doc/${f}.1 ${STAGEDIR}${MANPREFIX}/share/man/man1
 	${INSTALL_MAN} ${WRKSRC}/doc/${f}.fr.1 ${STAGEDIR}${MANPREFIX}/share/man/fr/man1
 .endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if (${OSVERSION} >= 1400042)
+MAKE_ARGS=	DLDFLAGS=-L=-Wl,-z,nostart-stop-gc
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/cheesecutter/files/patch-Makefile.ldc b/audio/cheesecutter/files/patch-Makefile.ldc
index 2c3ddca6aaa5..2bab9007ea46 100644
--- a/audio/cheesecutter/files/patch-Makefile.ldc
+++ b/audio/cheesecutter/files/patch-Makefile.ldc
@@ -1,25 +1,42 @@
 --- Makefile.ldc.orig	2021-01-21 17:07:49 UTC
 +++ Makefile.ldc
 @@ -1,5 +1,7 @@
  # make install DESTDIR=/home/yamo/devel/cc2/snap/parts/ccutter/install
  
 +PREFIX?=/usr
 +EXAMPLESDIR?=/usr/share/examples/ccutter
  LIBS=-L-ldl -L-lstdc++
  COMFLAGS=-O2
  VERSION=$(shell cat Version)
-@@ -38,10 +40,10 @@ c64: $(C64OBJS)
+@@ -19,7 +21,7 @@ include Makefile.objects.mk
+ all: ct2util ccutter
+ 
+ ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS)
+-	$(DC) $(COMFLAGS) -of=$@ $(OBJS) $(CXX_OBJS) $(LIBS)
++	$(DC) $(COMFLAGS) $(DLDFLAGS) -of=$@ $(OBJS) $(CXX_OBJS) $(LIBS)
+ 
+ 
+ .cpp.o : $(CXX_SRCS)
+@@ -31,17 +33,17 @@ ccutter:$(C64OBJS) $(OBJS) $(CXX_OBJS)
+ ct: $(C64OBJS) $(CTOBJS)
+ 
+ ct2util: $(C64OBJS) $(UTILOBJS)
+-	$(DC) $(COMFLAGS) -of=$@ $(UTILOBJS)
++	$(DC) $(COMFLAGS) $(DLDFLAGS) -of=$@ $(UTILOBJS)
+ 
+ c64: $(C64OBJS)
+ 
  install: all
  	strip ccutter$(EXE)
  	strip ct2util$(EXE)
 -	cp ccutter$(EXE) $(DESTDIR)
 -	cp ct2util$(EXE) $(DESTDIR)
 -	mkdir $(DESTDIR)/example_tunes
 -	cp -r tunes/* $(DESTDIR)/example_tunes
 +	cp ccutter$(EXE) $(DESTDIR)$(PREFIX)/bin
 +	cp ct2util$(EXE) $(DESTDIR)$(PREFIX)/bin
 +	mkdir -p $(DESTDIR)/$(EXAMPLESDIR)/example_tunes
 +	cp -r tunes/* $(DESTDIR)/$(EXAMPLESDIR)/example_tunes
  
  # release version with additional optimizations
  release: DFLAGS += -frelease -fno-bounds-check