diff --git a/misc/pkgsel/macros b/misc/pkgsel/macros
index 9e5d32ccd..d4a794e5f 100644
--- a/misc/pkgsel/macros
+++ b/misc/pkgsel/macros
@@ -10,7 +10,24 @@ INCLUDE() {
 }
 
 ADD() {
-	echo "/[ =]$1 /	{ p ; d } ;"
+	echo "/[ =]$1 / { s/^O /X / ; p ; d } ;"
+}
+
+ADD_WITH_DEPS() {
+	if [ ! -d package/*/${1} ] ; then
+		echo "No package by the name of '${1}'"
+		continue
+	fi
+	if [ ! -f package/*/${1}/${1}.cache ] ; then
+		echo "Package ${1} has no cache file!"
+		continue
+	fi
+	ADD "${1}"
+	grep '^\[DEP\] ' package/*/${1}/${1}.cache | cut -d' ' -f 2- | \
+		tr ' ' '\n' | while read pkg ; do
+		ADD "${pkg}"
+	done
+	shift
 }
 
 REMOVE() {
diff --git a/misc/pkgsel/sets/xorg.set b/misc/pkgsel/sets/xorg.set
index 60625f37b..220e183c5 100644
--- a/misc/pkgsel/sets/xorg.set
+++ b/misc/pkgsel/sets/xorg.set
@@ -30,7 +30,9 @@
 / vlock /                       { p; d; };
 / xorg /			{ p; d; };
 / zsh/                          { p; d; };
-
+/ fontconfig /			{ p; d; };
+/ netkit-rsh /			{ p; d; };
+/ libdrm /			{ p; d; };
 
 # Some architecture-specifc-packages with missing deps
 / macosd /                      { s/^X /O / ; p; d; };