diff --git a/emulators/flexemu/Makefile b/emulators/flexemu/Makefile
index 05f1f9ca864c..e53565fa3a39 100644
--- a/emulators/flexemu/Makefile
+++ b/emulators/flexemu/Makefile
@@ -1,26 +1,31 @@
 PORTNAME=	flexemu
 DISTVERSIONPREFIX=	V
 DISTVERSION=	3.20
+PORTREVISION=	1
 CATEGORIES=	emulators
 
 MAINTAINER=	rhurlin@FreeBSD.org
 COMMENT=	MC6809 emulator running FLEX operating system
 WWW=		https://flexemu.neocities.org/
 
 LICENSE=	GPLv2
 
 USES=		desktop-file-utils gl libtool qt:5 shared-mime-info xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	aladur
 GH_TUPLE=	google:googletest:e1a38bc3:googletest/googletest
 USE_GL=		gl
-USE_QT=		buildtools:build concurrent core dbus declarative \
-		declarative-test designer gui help multimedia network \
-		opengl printsupport qmake:build script scripttools \
-		sensors serialport sql svg testlib widgets x11extras \
-		xml xmlpatterns
+USE_QT=		buildtools:build core dbus gui network printsupport \
+		qmake:build widgets x11extras
 USE_XORG=	ice sm x11
 
 GNU_CONFIGURE=	yes
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+post-install:
+	@${RM} ${STAGEDIR}${PREFIX}/bin/rcvflex
+	@${RM} ${STAGEDIR}${PREFIX}/bin/send2flx
+	@${RM} ${STAGEDIR}${PREFIX}/bin/testdaa
+
+.include <bsd.port.post.mk>
diff --git a/emulators/flexemu/pkg-plist b/emulators/flexemu/pkg-plist
index 53a6ecfce6ab..d82854e490d1 100644
--- a/emulators/flexemu/pkg-plist
+++ b/emulators/flexemu/pkg-plist
@@ -1,116 +1,113 @@
 bin/bin2s19
 bin/dsktool
 bin/flex2hex
 bin/flexemu
 bin/flexplorer
 bin/fromflex
 bin/mdcrtool
-bin/rcvflex
-bin/send2flx
-bin/testdaa
 bin/toflex
-%%ETCDIR%%.conf
+etc/flexemu.conf
 share/applications/flexemu-flexplorer.desktop
 share/applications/flexemu.desktop
 %%DATADIR%%/6809diag.pdf
 %%DATADIR%%/6809fadg.pdf
 %%DATADIR%%/6x09_Instruction_Sets.pdf
 %%DATADIR%%/TSC_Text_Processor.pdf
 %%DATADIR%%/asmb.pdf
 %%DATADIR%%/ba2bqs.pdf
 %%DATADIR%%/basic_um.pdf
 %%DATADIR%%/basprec.pdf
 %%DATADIR%%/boot
 %%DATADIR%%/btx.dsk
 %%DATADIR%%/cedric.dsk
 %%DATADIR%%/cedric.pdf
 %%DATADIR%%/colors.dsk
 %%DATADIR%%/coltab.hex
 %%DATADIR%%/crasmb.pdf
 %%DATADIR%%/debug.pdf
 %%DATADIR%%/diag6809.dsk
 %%DATADIR%%/dynadocu.dsk
 %%DATADIR%%/dynamite.pdf
 %%DATADIR%%/dynastar.pdf
 %%DATADIR%%/e2hwdesc.htm
 %%DATADIR%%/f77.pdf
 %%DATADIR%%/flex2um.pdf
 %%DATADIR%%/flexapg.pdf
 %%DATADIR%%/flexdos.htm
 %%DATADIR%%/flexemu.css
 %%DATADIR%%/flexemu.htm
 %%DATADIR%%/flexerr.htm
 %%DATADIR%%/flexfcb.htm
 %%DATADIR%%/flexfms.htm
 %%DATADIR%%/flexfs.htm
 %%DATADIR%%/flexmem.htm
 %%DATADIR%%/flexuser.htm
 %%DATADIR%%/flexutil.htm
 %%DATADIR%%/games.dsk
 %%DATADIR%%/images/2x384flx.png
 %%DATADIR%%/images/2x384k.png
 %%DATADIR%%/images/2x96k.png
 %%DATADIR%%/images/e2scn.png
 %%DATADIR%%/images/e2v5m.png
 %%DATADIR%%/images/e2v7m.png
 %%DATADIR%%/images/pat09_cursorpad.png
 %%DATADIR%%/images/pat09_key_down_arrow.png
 %%DATADIR%%/images/pat09_key_left_arrow.png
 %%DATADIR%%/images/pat09_key_left_limit.png
 %%DATADIR%%/images/pat09_key_mode.png
 %%DATADIR%%/images/pat09_key_right_arrow.png
 %%DATADIR%%/images/pat09_key_right_limit.png
 %%DATADIR%%/images/pat09_key_thick_left_arrow.png
 %%DATADIR%%/images/pat09_key_thick_lower_right_arrow.png
 %%DATADIR%%/images/pat09_key_thick_right_arrow.png
 %%DATADIR%%/images/pat09_key_thick_upper_left_arrow.png
 %%DATADIR%%/images/pat09_key_up_arrow.png
 %%DATADIR%%/images/pat09_keyboard.png
 %%DATADIR%%/images/pat09_numpad.png
 %%DATADIR%%/just.dsk
 %%DATADIR%%/just.pdf
 %%DATADIR%%/laycad.dsk
 %%DATADIR%%/layout.dsk
 %%DATADIR%%/linkload.pdf
 %%DATADIR%%/mc6809.htm
 %%DATADIR%%/mon24.htm
 %%DATADIR%%/mon24.s19
 %%DATADIR%%/mon24z.s19
 %%DATADIR%%/mon53.s19
 %%DATADIR%%/mon54.s19
 %%DATADIR%%/monu54-6.s19
 %%DATADIR%%/neumon54.hex
 %%DATADIR%%/neumon54.htm
 %%DATADIR%%/pictures.dsk
 %%DATADIR%%/relasmb.pdf
 %%DATADIR%%/source.dsk
 %%DATADIR%%/swflexum.pdf
 %%DATADIR%%/system.dsk
 %%DATADIR%%/system.mdcr
 %%DATADIR%%/system54.dsk
 %%DATADIR%%/tedit.pdf
 %%DATADIR%%/test.dsk
 %%DATADIR%%/tsc_man.dsk
 %%DATADIR%%/util_man.pdf
 share/icons/hicolor/128x128/apps/flexemu-flexplorer.png
 share/icons/hicolor/128x128/apps/flexemu-fsetup.png
 share/icons/hicolor/128x128/apps/flexemu.png
 share/icons/hicolor/16x16/apps/flexemu-flexplorer.png
 share/icons/hicolor/16x16/apps/flexemu-fsetup.png
 share/icons/hicolor/16x16/apps/flexemu.png
 share/icons/hicolor/256x256/apps/flexemu-flexplorer.png
 share/icons/hicolor/256x256/apps/flexemu-fsetup.png
 share/icons/hicolor/256x256/apps/flexemu.png
 share/icons/hicolor/32x32/apps/flexemu-flexplorer.png
 share/icons/hicolor/32x32/apps/flexemu-fsetup.png
 share/icons/hicolor/32x32/apps/flexemu.png
 share/icons/hicolor/48x48/apps/flexemu-flexplorer.png
 share/icons/hicolor/48x48/apps/flexemu-fsetup.png
 share/icons/hicolor/48x48/apps/flexemu.png
 share/icons/hicolor/64x64/apps/flexemu-flexplorer.png
 share/icons/hicolor/64x64/apps/flexemu-fsetup.png
 share/icons/hicolor/64x64/apps/flexemu.png
 share/icons/hicolor/scalable/apps/flexemu-flexplorer.svg
 share/icons/hicolor/scalable/apps/flexemu-fsetup.svg
 share/icons/hicolor/scalable/apps/flexemu.svg
 share/mime/packages/flexemu.xml