diff --git a/packages/debug/meta b/packages/debug/meta
index e5812c1bd5..a2d2392265 100644
--- a/packages/debug/meta
+++ b/packages/debug/meta
@@ -35,6 +35,3 @@ PKG_IS_ADDON="no"
 
 PKG_AUTORECONF="no"
 
-if [ "$DISPLAYSERVER" = xorg-server ]; then
-  PKG_DEPENDS="$PKG_DEPENDS mrxvt"
-fi
diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index f822844687..f4eba6a9af 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -66,3 +66,7 @@ fi
 if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
   PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER"
 fi
+
+if [ "$DEVTOOLS" = yes ]; then
+  PKG_DEPENDS="$PKG_DEPENDS mrxvt"
+fi