diff --git a/audio/klystrack/Makefile b/audio/klystrack/Makefile
index 1044a424474d..5c148c5f341d 100644
--- a/audio/klystrack/Makefile
+++ b/audio/klystrack/Makefile
@@ -1,61 +1,60 @@
 PORTNAME=	klystrack
-DISTVERSION=	1.7.6-make-fix-12
-DISTVERSIONSUFFIX=	-gfe6e746
-PORTREVISION=	1
+PORTVERSION=	1.7.6
 CATEGORIES=	audio
 
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Tracker for making C64/NES/Amiga-style chiptunes
 WWW=		https://kometbomb.github.io/klystrack/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libasound.so:audio/alsa-lib
 
 USES=		compiler:c11 desktop-file-utils dos2unix gmake \
 		localbase:ldconfig sdl
 DOS2UNIX_FILES=	klystron/common.mk klystron/Makefile klystron/src/gui/menu.h \
 		klystron/tools/editor/Makefile \
 		klystron/tools/makebundle/Makefile Makefile player/Makefile \
 		scancode-tool/Makefile
 USE_CSTD=	c99
 USE_GITHUB=	yes
 GH_ACCOUNT=	kometbomb
+GH_TAGNAME=	fe6e746
 GH_TUPLE=	kometbomb:klystron:1074324:klystron/klystron
 USE_SDL=	gfx2 image2 mixer2 sdl2 ttf2
 
 MAKE_ENV+=	CFG=release \
 		V=1
 ALL_TARGET=	build
 
 CFLAGS+=	-fPIC
 
 OPTIONS_DEFINE=	EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e "s#Default.kt#${DATADIR}/Default.kt#" \
 		${WRKSRC}/src/main.c
 
 do-install:
 .for d in bin share/klystrack share/applications share/pixmaps \
 	share/licenses/klystrack lib/klystrack share/man/man1
 	${MKDIR} ${STAGEDIR}${PREFIX}/${d}
 .endfor
 	${INSTALL_PROGRAM} ${WRKSRC}/bin.release/klystrack \
 		${STAGEDIR}${PREFIX}/bin/klystrack
 	cd ${WRKSRC}/res && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}/${PREFIX}/lib/klystrack/res/
 	cd ${WRKSRC}/key && \
 		${COPYTREE_SHARE} \* ${STAGEDIR}/${PREFIX}/lib/klystrack/key/
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} \* ${STAGEDIR}/${EXAMPLESDIR}
 	${INSTALL_MAN} ${WRKSRC}/doc/klystrack.1 \
 		${STAGEDIR}${MANPREFIX}/share/man/man1
 	${INSTALL_DATA} ${WRKSRC}/doc/Default.kt \
 		${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/linux/klystrack.desktop \
 		${STAGEDIR}${DESKTOPDIR}
 	${INSTALL_DATA} ${WRKSRC}/icon/256x256.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/klystrack.png
 
 .include <bsd.port.mk>
diff --git a/audio/klystrack/distinfo b/audio/klystrack/distinfo
index 72473a9bcddb..ba22379d94d5 100644
--- a/audio/klystrack/distinfo
+++ b/audio/klystrack/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1609521143
-SHA256 (kometbomb-klystrack-1.7.6-make-fix-12-gfe6e746_GH0.tar.gz) = 79d233afd0ceb6fe45f422861b71e3f27da90c6912ea1829fe4afcc94e33c211
-SIZE (kometbomb-klystrack-1.7.6-make-fix-12-gfe6e746_GH0.tar.gz) = 576157
+TIMESTAMP = 1678223201
+SHA256 (kometbomb-klystrack-1.7.6-fe6e746_GH0.tar.gz) = 1744a75c6672fdcf4b6db7e85d082a14dfb3ed38b4b3c8cc4bffd5e9d3323870
+SIZE (kometbomb-klystrack-1.7.6-fe6e746_GH0.tar.gz) = 576019
 SHA256 (kometbomb-klystron-1074324_GH0.tar.gz) = 1a9a5a0ccb9039d2b2be3f0bd4f2a4d9684760a06ed79f136ed71c030d2cfe8c
 SIZE (kometbomb-klystron-1074324_GH0.tar.gz) = 89088
diff --git a/audio/klystrack/files/patch-Makefile b/audio/klystrack/files/patch-Makefile
index e034e7b90d09..08d115f4c3b7 100644
--- a/audio/klystrack/files/patch-Makefile
+++ b/audio/klystrack/files/patch-Makefile
@@ -1,49 +1,49 @@
---- Makefile.orig	2021-01-18 12:13:12 UTC
+--- Makefile.orig	2023-03-07 21:13:01 UTC
 +++ Makefile
 @@ -1,7 +1,7 @@
  TARGET := klystrack
  KLYSTRON=klystron
  ECHO := echo
 -CFG := debug
 +CFG ?= debug
  EXE := bin.$(CFG)/$(TARGET)
  MACHINE :=
  NSIS := C:/program\ files\ \(x86\)/nsis/makensis.exe -V2 -NOCD
 @@ -10,7 +10,7 @@ MAKEBUNDLE := $(KLYSTRON)/tools/bin/makebundle.exe
  UPLOAD := cmd.exe /c upload.bat
  DLLS := zip/data/SDL2_image.dll zip/data/SDL2.dll
  EXT := .c
 -CC := gcc
 +CC ?= gcc
  CDEP := $(CC) -E -MM
  ARCHIVE := klystrack
  INSTALLER := klystrack.exe
 @@ -21,7 +21,7 @@ REV := cp -f
  
  PREFIX ?= /usr
  BINDIR = $(PREFIX)/bin
 -CFLAGS := $(MACHINE) -ftree-vectorize -std=gnu99 -Wno-strict-aliasing
 +CFLAGS ?= $(MACHINE) -ftree-vectorize -std=gnu99 -Wno-strict-aliasing
  
  ifdef COMSPEC
  	# Compiling for Windows
 @@ -72,7 +72,7 @@ else
    CFLAGS += -O3 -pg -Wall
   else
    ifeq ($(CFG),release)
 -   CFLAGS += -O3 -Wall -s
 +   CFLAGS += -Wall
     ifdef COMSPEC
  	 CFLAGS += -mwindows
     endif
 @@ -136,8 +136,8 @@ endef
  
  build: Makefile src/version.h src/version_number.h
  	$(Q)touch src/version
 -	$(Q)$(MAKE) -C $(KLYSTRON) CFG=$(CFG) EXTFLAGS="$(EXTFLAGS)"
 -	$(Q)$(MAKE) all CFG=$(CFG) EXTFLAGS="$(EXTFLAGS)"
 +	$(Q)$(MAKE_ENV)$(MAKE) -C $(KLYSTRON) CFG=$(CFG) EXTFLAGS="$(EXTFLAGS)"
 +	$(Q)$(MAKE_ENV)$(MAKE) all CFG=$(CFG) EXTFLAGS="$(EXTFLAGS)"
  
  src/version.h: src/version
  	$(Q)echo '#ifndef VERSION_H' > ./src/version.h
diff --git a/audio/klystrack/pkg-descr b/audio/klystrack/pkg-descr
index 600b4ee1e81a..b9ea1e52c2e6 100644
--- a/audio/klystrack/pkg-descr
+++ b/audio/klystrack/pkg-descr
@@ -1 +1,8 @@
-Klystrack is a tracker for making C64/NES/Amiga-style chiptunes.
+Klystrack is a versatile music tracker software designed for creating
+chiptune music on a variety of platforms. It supports a wide range of
+sound chips, including the Commodore 64's SID chip, the Nintendo Game
+Boy's DMG chip, and Amiga-style chiptunes. With its intuitive interface
+and powerful features, Klystrack has become a popular choice among
+chiptune musicians and retro gaming enthusiasts. It can be used to
+compose original music or to recreate classic game soundtracks, making
+it a valuable tool for anyone interested in the world of chip music.