diff --git a/audio/solfege/Makefile b/audio/solfege/Makefile
index 72347b5438d2..a6214529db3c 100644
--- a/audio/solfege/Makefile
+++ b/audio/solfege/Makefile
@@ -1,12 +1,13 @@
 PORTNAME=	solfege
 DISTVERSION=	3.23.5pre2
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	https://git.savannah.gnu.org/cgit/${PORTNAME}.git/snapshot/
 PKGNAMESUFFIX=	-nosound
 
 MAINTAINER=	m.ne@gmx.net
 COMMENT=	Free ear training software
-WWW=	https://www.gnu.org/software/solfege/
+WWW=		https://www.gnu.org/software/solfege/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
@@ -22,10 +23,11 @@ USE_GNOME=	pygobject3
 
 SHEBANG_FILES=	exercises/standard/lesson-files/bin/csound-play-harmonic-interval.sh
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-oss-sound \
-		--enable-docbook-stylesheet=${STYLESHEET}
-CONFIGURE_ENV=	ac_cv_path_XML2PO=""
+GNU_CONFIGURE=			yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS=			--disable-oss-sound \
+				--enable-docbook-stylesheet=${STYLESHEET}
+CONFIGURE_ENV=			ac_cv_path_XML2PO=""
 
 MAKE_ARGS=	nopycompile=YES \
 		skipmanual=yes
@@ -43,8 +45,6 @@ post-patch:
 	@${REINPLACE_CMD} -e \
 		's|type=sequencer-device|type=fake-synth| ; \
 		 s|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/default.config
-#	@${FIND} ${WRKSRC} -name "*.py" | ${XARGS} ${REINPLACE_CMD} -e \
-#		's|.*\(#!\).*|\1${PYTHON_CMD}|'
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \
diff --git a/audio/solfege/pkg-plist b/audio/solfege/pkg-plist
index ea1636e48dd6..c83243968463 100644
--- a/audio/solfege/pkg-plist
+++ b/audio/solfege/pkg-plist
@@ -1,6 +1,5 @@
 bin/solfege
 etc/solfege
-man/man1/solfege.1.gz
 share/applications/solfege.desktop
 share/locale/ca/LC_MESSAGES/solfege.mo
 share/locale/cs/LC_MESSAGES/solfege.mo
@@ -26,6 +25,7 @@ share/locale/sv/LC_MESSAGES/solfege.mo
 share/locale/tr/LC_MESSAGES/solfege.mo
 share/locale/vi/LC_MESSAGES/solfege.mo
 share/locale/zh_CN/LC_MESSAGES/solfege.mo
+share/man/man1/solfege.1.gz
 share/pixmaps/solfege.svg
 %%DATADIR%%/default.config
 %%DATADIR%%/exercises/standard/csound-tree.txt