diff --git a/comms/ebook2cw/Makefile b/comms/ebook2cw/Makefile
index 210da6dcd83e..72c4228933c9 100644
--- a/comms/ebook2cw/Makefile
+++ b/comms/ebook2cw/Makefile
@@ -1,42 +1,44 @@
 PORTNAME=	ebook2cw
 DISTVERSION=	0.8.5
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	https://fkurz.net/ham/ebook2cw/
 
 MAINTAINER=	hamradio@FreeBSD.org
 COMMENT=	Convert text files into cw as an mp3 or ogg file
 WWW=		https://fkurz.net/ham/ebook2cw.html
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libmp3lame.so:audio/lame \
+		libmpg123.so:audio/mpg123 \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis
 
 USES=		gettext
 
 PIE_UNSAFE=	yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|'g \
 	     ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|'g \
 	     ${WRKSRC}/Makefile
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ebook2cw ${STAGEDIR}${PREFIX}/bin/ebook2cw
 	${INSTALL_MAN} ${WRKSRC}/ebook2cw.1 ${STAGEDIR}${PREFIX}/share/man/man1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 .for f in ebook2cw.conf isomap.txt utf8map.txt
 	${INSTALL_DATA} ${WRKSRC}/$f ${STAGEDIR}${EXAMPLESDIR}/$f
 .endfor
 
 .include <bsd.port.mk>
diff --git a/comms/ebook2cw/files/patch-Makefile b/comms/ebook2cw/files/patch-Makefile
index e69a00d09e6f..cc7a99a5f22f 100644
--- a/comms/ebook2cw/files/patch-Makefile
+++ b/comms/ebook2cw/files/patch-Makefile
@@ -1,38 +1,46 @@
 --- Makefile.orig	2023-08-16 18:54:49 UTC
 +++ Makefile
-@@ -1,30 +1,16 @@ VERSION=0.8.5
+@@ -1,37 +1,23 @@ VERSION=0.8.5
  # ebook2cw Makefile -- Fabian Kurz, DJ5CW -- http://fkurz.net/ham/ebook2cw.html
  
  VERSION=0.8.5
 -DESTDIR ?= /usr
 +DESTDIR ?= %%PREFIX%%
 +CC	?= gcc
  
 -# Set to NO to compile without Lame/Ogg-vorbis support
 -USE_LAME?=YES
 -USE_OGG?=YES
 -
  CFLAGS:=$(CFLAGS) -D DESTDIR=\"$(DESTDIR)\" -D VERSION=\"$(VERSION)\"
 +CFLAGS+= -I%%LOCALBASE%%/include -D LAME -D OGGV
-+LDFLAGS+= -L%%LOCALBASE%%/lib -lintl -lmp3lame -lvorbis -lvorbisenc -logg
++LDFLAGS+= -L%%LOCALBASE%%/lib -lintl -lmp3lame -lvorbis -lvorbisenc -logg -lmpg123
  
 -ifeq ($(USE_LAME), YES)
 -		CFLAGS:=$(CFLAGS) -D LAME
 -		LDFLAGS:=$(LDFLAGS) -lmp3lame 
 -endif
 -ifeq ($(USE_OGG), YES)
 -		CFLAGS:=$(CFLAGS) -D OGGV
 -		LDFLAGS:=$(LDFLAGS) -lvorbis -lvorbisenc -logg
 -endif
 -
  UNAME := $(shell uname)
  
 -ifeq ($(UNAME), Darwin)
 -	LDFLAGS += -lintl
 -endif
--
--all: ebook2cw
 +all: ebook2cw cgi
  
+-all: ebook2cw
+-
  ebook2cw: ebook2cw.c codetables.h
  	$(CC) ebook2cw.c -pedantic -Wall -Wno-format-truncation -lm $(LDFLAGS) $(CFLAGS) -o ebook2cw
+ 	msgfmt -o po/de.mo po/de.po
+ 
+ cgi: ebook2cw.c codetables.h
+-	$(CC) -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi
++	$(CC) ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -o cw.cgi
+ 
+ cgibuffered: ebook2cw.c codetables.h
+ 	$(CC) -static ebook2cw.c $(LDFLAGS) -lm $(CFLAGS) -D CGI -D CGIBUFFERED -o cw.cgi