diff --git a/audio/goattracker/Makefile b/audio/goattracker/Makefile
index fa3722496b81..bd3be58ed6a4 100644
--- a/audio/goattracker/Makefile
+++ b/audio/goattracker/Makefile
@@ -1,50 +1,50 @@
 # Created by: Emanuel Haupt <ehaupt@FreeBSD.org>
 
 PORTNAME=	goattracker
-PORTVERSION=	2.75
+PORTVERSION=	2.76
 CATEGORIES=	audio
 MASTER_SITES=	SF/goattracker2/GoatTracker%202/${PORTVERSION} \
 		LOCAL/ehaupt
 DISTNAME=	GoatTracker_${PORTVERSION}
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Crossplatform music editor for creating Commodore 64 music
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/copying
 
 USES=		dos2unix gmake sdl zip
 USE_SDL=	sdl
 
 MAKEFILE=	makefile
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+DESKTOP_ENTRIES=	"GoatTracker 2" \
+			"${COMMENT}" \
+			"${PREFIX}/share/pixmaps/goattrk2.ico" \
+			"goattrk2" \
+			"" \
+			false
 
-DESKTOP_ENTRIES="GoatTracker 2" \
-		"${COMMENT}" \
-		"${PREFIX}/share/pixmaps/goattrk2.ico" \
-		"goattrk2" \
-		"" \
-		false
+NO_WRKSUBDIR=	yes
 
-WRKSRC=		${WRKDIR}/goattrk2
+OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-extract:
 	@${FIND} ${WRKSRC} -name '*.o' -type f -exec ${RM} -f {} \+
 
 do-build:
 	@cd ${WRKSRC}/src/bme; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 	@cd ${WRKSRC}/src; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 do-install:
 .for f in goattrk2 gt2reloc ins2snd2 mod2sng sngspli2
 	${INSTALL_PROGRAM} ${WRKSRC}/linux/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/src/goattrk2.ico ${STAGEDIR}${PREFIX}/share/pixmaps
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/*.sng ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/audio/goattracker/distinfo b/audio/goattracker/distinfo
index 3dfb4a357ab4..ad9ecc57b95b 100644
--- a/audio/goattracker/distinfo
+++ b/audio/goattracker/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1553163526
-SHA256 (GoatTracker_2.75.zip) = 93f6bec01b822093f2fb4f1f220d72d09cba98e5c9c8420bc3666e7ca83da9ce
-SIZE (GoatTracker_2.75.zip) = 1516416
+TIMESTAMP = 1621165611
+SHA256 (GoatTracker_2.76.zip) = c1b6b159ec0d37ae68599ac83be8934a71cd543e480eb5225f844b62151cea34
+SIZE (GoatTracker_2.76.zip) = 1220213
diff --git a/audio/goattracker/files/patch-src_makefile.common b/audio/goattracker/files/patch-src_makefile.common
index 308f9cd7455c..70e0026e2d54 100644
--- a/audio/goattracker/files/patch-src_makefile.common
+++ b/audio/goattracker/files/patch-src_makefile.common
@@ -1,11 +1,13 @@
---- src/makefile.common.orig	2019-03-21 10:51:16 UTC
+--- src/makefile.common.orig	2021-05-16 12:09:42 UTC
 +++ src/makefile.common
-@@ -2,7 +2,7 @@
+@@ -2,8 +2,8 @@
  
  CC?=gcc
  CXX?=g++
--CFLAGS+=-Ibme -Iasm -O3 -fpermissive
+-CFLAGS+=-Ibme -Iasm -O3
+-CXXFLAGS+=$(CFLAGS) -fpermissive
 +CFLAGS+=-Ibme -Iasm
- CXXFLAGS+=$(CFLAGS)
++CXXFLAGS+=$(CFLAGS)
  
  EXE=	$(PREFIX)goattrk2$(SUFFIX) \
+ 	$(PREFIX)gt2reloc$(SUFFIX) \