diff --git a/Makefile b/Makefile
index 429162d4327..4a6991b9b49 100644
--- a/Makefile
+++ b/Makefile
@@ -41,7 +41,6 @@ SUBDIR += net-im
 SUBDIR += net-mgmt
 SUBDIR += net-p2p
 SUBDIR += news
-SUBDIR += palm
 SUBDIR += polish
 SUBDIR += ports-mgmt
 SUBDIR += portuguese
diff --git a/Mk/Scripts/desktop-categories.sh b/Mk/Scripts/desktop-categories.sh
index 0edbf4a991e..14d9b9643ac 100644
--- a/Mk/Scripts/desktop-categories.sh
+++ b/Mk/Scripts/desktop-categories.sh
@@ -57,7 +57,6 @@ for native_category in ${dp_CATEGORIES}; do
 		net-p2p)	c="Network P2P"				;;
 		net-vpn)	c="Network VPN"				;;
 		news)		c="Network News"			;;
-		palm)		c="Office PDA"				;;
 		parallel)	c="ParallelComputing"			;;
 		pear)		c="Development WebDevelopment"		;;
 		perl5)		c="Development"				;;
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index 9de1d7e822a..d6bdd4bc05b 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1401,13 +1401,6 @@ DEV_WARNING+=		"Using USE_XORG alone is deprecated, please use USES=xorg"
 USES+=	xorg
 .endif
 
-.if defined(XORG_CAT)
-DEV_WARNING+=		"Using XORG_CAT is deprecated, please use USES=xorg-cat:category"
-.if !defined(USES) || !${USES:Mxorg-cat*}
-USES+=	xorg-cat:${XORG_CAT}
-.endif
-.endif
-
 .if defined(USE_PHP) && (!defined(USES) || ( defined(USES) && !${USES:Mphp*} ))
 DEV_WARNING+=		"Using USE_PHP alone is deprecated, please use USES=php"
 USES+=	php
@@ -2642,7 +2635,7 @@ VALID_CATEGORIES+= accessibility afterstep arabic archivers astro audio \
 	games geography german gnome gnustep graphics hamradio hardenedbsd haskell hebrew hungarian \
 	irc japanese java kde ${_KDE_CATEGORIES_SUPPORTED} kld korean lang linux lisp \
 	mail mate math mbone misc multimedia net net-im net-mgmt net-p2p net-vpn news \
-	palm parallel pear perl5 plan9 polish portuguese ports-mgmt \
+	parallel pear perl5 plan9 polish portuguese ports-mgmt \
 	print python ruby rubygems russian \
 	scheme science security shells spanish sysutils \
 	tcl textproc tk \
diff --git a/Mk/bsd.sanity.mk b/Mk/bsd.sanity.mk
index c139e865c71..ec2758e70aa 100644
--- a/Mk/bsd.sanity.mk
+++ b/Mk/bsd.sanity.mk
@@ -203,7 +203,8 @@ SANITY_UNSUPPORTED=	USE_OPENAL USE_FAM USE_MAKESELF USE_ZIP USE_LHA USE_CMAKE \
 		USE_RCORDER USE_OPENSSL WANT_GNOME RUBYGEM_AUTOPLIST WANT_SDL \
 		INSTALLS_EGGINFO USE_DOS2UNIX NO_STAGE USE_RUBYGEMS USE_GHOSTSCRIPT \
 		USE_GHOSTSCRIPT_BUILD USE_GHOSTSCRIPT_RUN USE_AUTOTOOLS APACHE_PORT \
-		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD
+		USE_FPC_RUN WANT_FPC_BASE WANT_FPC_ALL USE_QT4 USE_QT5 QT_NONSTANDARD \
+		XORG_CAT
 SANITY_DEPRECATED=	MLINKS \
 			USE_MYSQL WANT_MYSQL_VER \
 			PYDISTUTILS_INSTALLNOSINGLE \
@@ -290,6 +291,7 @@ WANT_FPC_ALL_ALT=	USES=fpc:all
 USE_QT4_ALT=		USES=qt:5 and USE_QT=${USE_QT4} \(beware\) as Qt4 has been removed
 USE_QT5_ALT=		USES=qt:5 and USE_QT=${USE_QT5}
 QT_NONSTANDARD_ALT=	USES=qmake:no_env
+XORG_CAT_ALT=		USES=xorg-cat:${XORG_CAT}
 
 .for a in ${SANITY_DEPRECATED}
 .if defined(${a})