diff --git a/audio/cheesecutter/Makefile b/audio/cheesecutter/Makefile
index bfecc3c9b..b3ef2cced 100644
--- a/audio/cheesecutter/Makefile
+++ b/audio/cheesecutter/Makefile
@@ -12,8 +12,6 @@ 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
 
@@ -37,4 +35,10 @@ post-install:
 	${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 2c3ddca6a..2bab9007e 100644
--- a/audio/cheesecutter/files/patch-Makefile.ldc
+++ b/audio/cheesecutter/files/patch-Makefile.ldc
@@ -8,7 +8,24 @@
  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)