diff --git a/cad/electric-ng/Makefile b/cad/electric-ng/Makefile
index 84484b4c4eea..2b4e738a5afb 100644
--- a/cad/electric-ng/Makefile
+++ b/cad/electric-ng/Makefile
@@ -42,7 +42,7 @@ J3DLIB=		${JAVA_HOME}/jre/lib/ext/j3dcore.jar
 PLUGINDIR=	${PREFIX}/libexec/${PORTNAME}${PKGNAMESUFFIX}
 
 DESKTOP_ENTRIES="Electric-NG" "${COMMENT}" "${PORTNAME}${PKGNAMESUFFIX}" \
-			"${PORTNAME}${PKGNAMESUFFIX}" "Development;Electronics;Engineering;" ${FALSE}
+			"${PORTNAME}${PKGNAMESUFFIX}" "Development;Electronics;Engineering;" false
 
 .include <bsd.port.options.mk>
 
diff --git a/comms/xlog/Makefile b/comms/xlog/Makefile
index 4f0b55baf660..078431aaad9b 100644
--- a/comms/xlog/Makefile
+++ b/comms/xlog/Makefile
@@ -26,7 +26,7 @@ OPTIONS_SUB=	yes
 NLS_USES=	gettext
 NLS_CONFIGURE_OFF=	--disable-nls
 
-DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "${PORTNAME}.xpm" \
-	"${PORTNAME}" "Utility;" ${FALSE}
+DESKTOP_ENTRIES="${PORTNAME}" "${COMMENT}" "${PORTNAME}" \
+	"${PORTNAME}" "Utility;" false
 
 .include <bsd.port.mk>
diff --git a/editors/p5-Padre/Makefile b/editors/p5-Padre/Makefile
index 4c90b6b79a3d..bc91d90d190e 100644
--- a/editors/p5-Padre/Makefile
+++ b/editors/p5-Padre/Makefile
@@ -78,7 +78,7 @@ DESKTOP_ENTRIES="Padre" \
 		"The Perl IDE" \
 		"${PREFIX}/${SITE_PERL_REL}/auto/share/dist/Padre/icons/padre/64x64/logo.png" \
 		"padre" \
-		"Development;Perl;IDE;" \
+		"Development;IDE;" \
 		""
 
 WXSC_NAME=	Wx-Scintilla
diff --git a/games/flukz/Makefile b/games/flukz/Makefile
index 96e2a04ae646..d2e4aab74044 100644
--- a/games/flukz/Makefile
+++ b/games/flukz/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Vertically scrolling shoot'em up
 USES=		qmake
 USE_QT4=	multimedia network moc_build rcc_build
 
-DESKTOP_ENTRIES=	Flukz "" ${PORTNAME}.png \
+DESKTOP_ENTRIES=	Flukz "" ${PORTNAME} \
 			${PORTNAME} "Game;ArcadeGame;" true
 
 PLIST_FILES=	bin/flukz \
diff --git a/games/traindirector/Makefile b/games/traindirector/Makefile
index c8cafa45c3a1..d8f2edd621d7 100644
--- a/games/traindirector/Makefile
+++ b/games/traindirector/Makefile
@@ -22,7 +22,7 @@ WX_COMPS=	wx:lib
 WX_UNICODE=	yes
 
 DESKTOP_ENTRIES="Train Director" "${COMMENT}" "" "traindir3" \
-		"Game;Simulation;StrategyGame;" ${FALSE}
+		"Game;Simulation;StrategyGame;" false
 
 PLIST_FILES=	bin/traindir3
 
diff --git a/graphics/boxer/Makefile b/graphics/boxer/Makefile
index 864067edea25..47577bc89ba5 100644
--- a/graphics/boxer/Makefile
+++ b/graphics/boxer/Makefile
@@ -30,7 +30,7 @@ PORTDOCS=	ChangeLog
 OPTIONS_DEFINE=	DOCS
 
 DESKTOP_ENTRIES="Boxer" "" "${PORTNAME}" \
-		"${PORTNAME}" "Application;Graphics;" ""
+		"${PORTNAME}" "Graphics;" ""
 
 post-install:
 	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
diff --git a/misc/xdg-menu/Makefile b/misc/xdg-menu/Makefile
index 5f34973336a3..0f5ce0dc1aaf 100644
--- a/misc/xdg-menu/Makefile
+++ b/misc/xdg-menu/Makefile
@@ -30,7 +30,7 @@ INSTALLS_ICONS=	yes
 PORTDOCS=	*
 
 DESKTOP_ENTRIES="XDG-Menu" "" ${PORTNAME} \
-		"${PORTNAME}" "Application;System;" ""
+		"${PORTNAME}" "System;" ""
 
 OPTIONS_DEFINE=	DOCS ROX
 ROX_DESC=	Enable ROX panel applet support