diff --git a/emulators/cpmtools2/Makefile b/emulators/cpmtools2/Makefile
index d53cda7f87f0..1c21a7feb279 100644
--- a/emulators/cpmtools2/Makefile
+++ b/emulators/cpmtools2/Makefile
@@ -1,43 +1,43 @@
 PORTNAME=	cpmtools2
 PORTVERSION=	2.24
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators sysutils
 MASTER_SITES=	http://www.moria.de/~michael/cpmtools/files/
 DISTNAME=	${PORTNAME:C/2$//}-${PORTVERSION}
 
 MAINTAINER=	ak@FreeBSD.org
 COMMENT=	Tools to access CP/M disks and disk images
 WWW=		http://www.moria.de/~michael/cpmtools/
 
 LICENSE=	GPLv3
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/sbin \
 		--datarootdir=${DATADIR}
 
 OPTIONS_DEFINE=	LIBDSK
+OPTIONS_DEFAULT=	LIBDSK
 
 LIBDSK_DESC=	Access to disks and disk images support
 
 LIBDSK_CONFIGURE_ON=	--with-libdsk=${LOCALBASE}
 LIBDSK_CONFIGURE_OFF=	--with-libdsk=''
 LIBDSK_LIB_DEPENDS=	libdsk.so:emulators/libdsk
 
 # remove unneeded getopt*.c
 # remove curses from all but fsed.cpm
 # fixes for stage
 post-patch:
 	@${REINPLACE_CMD} -e 's|getopt$$(OBJEXT)||g; s|getopt1$$(OBJEXT)||g' \
 		-e 's|\($$(CC).*fsed.cpm$$(OBJEXT).*$$(DEVICEOBJ)\)|\1 -lncurses|' \
 		-e '/^CFLAGS=/s|@CFLAGS@|@CFLAGS@ -DDISKDEFS=\\"@datarootdir@/diskdefs\\" -DFORMAT=\\"$$(DEFFORMAT)\\"|' \
 		-e 's|diskdefs @datarootdir@/diskdefs|diskdefs $$(DESTDIR)@datarootdir@/diskdefs|' \
 		${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|\(FSED_CPM=fsed.cpm\) LIBS=\"-lcurses $$LIBS\"|\1|' \
 		${WRKSRC}/configure
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>
diff --git a/emulators/cpmtools2/distinfo b/emulators/cpmtools2/distinfo
index c14aaac8a24d..7bd50767026c 100644
--- a/emulators/cpmtools2/distinfo
+++ b/emulators/cpmtools2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1705993140
-SHA256 (cpmtools-2.24.tar.gz) = 051ab170d1dee69f1474bc2fd66d17288d6ba132b916612b9667cf852aa884d6
-SIZE (cpmtools-2.24.tar.gz) = 181215
+TIMESTAMP = 1774198806
+SHA256 (cpmtools-2.24.tar.gz) = 2f8b48e492c7e022316907cdd98460eb24f8d29e18f5df1869841e0513f5e26a
+SIZE (cpmtools-2.24.tar.gz) = 317803