diff --git a/media-gfx/nomacs/additional-files/nomacs.rdef.in b/media-gfx/nomacs/additional-files/nomacs.rdef.in
index 9f1dce59c..2a2cf1f40 100644
--- a/media-gfx/nomacs/additional-files/nomacs.rdef.in
+++ b/media-gfx/nomacs/additional-files/nomacs.rdef.in
@@ -5,10 +5,10 @@ resource app_flags B_MULTIPLE_LAUNCH;
 resource app_version {
        major  = @MAJOR@,
        middle = @MIDDLE@,
-       minor  = @MINOR@,
+       minor  = 0,
 
        variety = B_APPV_FINAL,
-       internal = @INTERNAL@,
+       internal = 0,
 
        short_info = "Nomacs ImageLounge",
        long_info  = "@LONG_INFO@"
diff --git a/media-gfx/nomacs/nomacs-3.16.recipe b/media-gfx/nomacs/nomacs-3.16.recipe
index 900ba2fad..1b78c6b36 100644
--- a/media-gfx/nomacs/nomacs-3.16.recipe
+++ b/media-gfx/nomacs/nomacs-3.16.recipe
@@ -7,7 +7,7 @@ COPYRIGHT="2011-2020 Markus Diem
 	2011-2020 Stefan Fiel
 	2011-2020 Florian Kleber"
 LICENSE="GNU LGPL v3"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://github.com/nomacs/nomacs/archive/$portVersion.224.tar.gz"
 CHECKSUM_SHA256="bbc7e9048026ef9e0d2b64902c88050f17a679ef3d3c009de2c3b7de5d1d217c"
 SOURCE_FILENAME="nomacs-$portVersion.tar.gz"
@@ -66,7 +66,7 @@ BUILD_REQUIRES="
 	devel:libQt5Svg$secondaryArchSuffix
 	devel:libQt5Widgets$secondaryArchSuffix
 	devel:libquazip5$secondaryArchSuffix
-	devel:libraw$secondaryArchSuffix >= 19
+	devel:libraw$secondaryArchSuffix
 	devel:libtiff$secondaryArchSuffix >= 5
 	devel:libz$secondaryArchSuffix
 	"
@@ -97,6 +97,7 @@ BUILD()
 	cd build
 
 	cmake .. \
+		-DCMAKE_BUILD_TYPE=Release \
 		-DUSE_SYSTEM_QUAZIP=ON \
 		-DENABLE_TRANSLATIONS=ON \
 		$cmakeDirArgs
@@ -112,16 +113,11 @@ INSTALL()
 	local APP_SIGNATURE="application/x-vnd.nomacs"
 	local MAJOR="`echo "$portVersion" | cut -d. -f1`"
 	local MIDDLE="`echo "$portVersion" | cut -d. -f2`"
-#	local MINOR="`echo "$portVersion" | cut -d. -f3`"
-	local MINOR="0"
-	local INTERNAL="0"
 	local LONG_INFO="$SUMMARY"
 	sed \
 		-e "s|@APP_SIGNATURE@|$APP_SIGNATURE|" \
 		-e "s|@MAJOR@|$MAJOR|" \
 		-e "s|@MIDDLE@|$MIDDLE|" \
-		-e "s|@MINOR@|$MINOR|" \
-		-e "s|@INTERNAL@|$INTERNAL|" \
 		-e "s|@LONG_INFO@|$LONG_INFO|" \
 		$portDir/additional-files/nomacs.rdef.in > nomacs.rdef