diff --git a/packages/x11/xserver/xorg-server/meta b/packages/x11/xserver/xorg-server/meta
index 0656819acd..0974534002 100644
--- a/packages/x11/xserver/xorg-server/meta
+++ b/packages/x11/xserver/xorg-server/meta
@@ -61,4 +61,8 @@ fi
   done
 
 # Tools
-  PKG_DEPENDS="$PKG_DEPENDS pciutils ratpoison xrandr setxkbmap"
+  PKG_DEPENDS="$PKG_DEPENDS pciutils xrandr setxkbmap"
+
+if [ -n "$WINDOWMANAGER" -a "$WINDOWMANAGER" != "none" ]; then
+  PKG_DEPENDS="$PKG_DEPENDS $WINDOWMANAGER"
+fi
diff --git a/projects/ATV/options b/projects/ATV/options
index 1d929429ad..14fbd7a423 100644
--- a/projects/ATV/options
+++ b/projects/ATV/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
diff --git a/projects/Fusion/options b/projects/Fusion/options
index de9f5ff959..507d65df6b 100644
--- a/projects/Fusion/options
+++ b/projects/Fusion/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon fglrx nvidia nouveau"
diff --git a/projects/Generic/options b/projects/Generic/options
index 188f19e5bc..b6d542ca54 100644
--- a/projects/Generic/options
+++ b/projects/Generic/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
diff --git a/projects/Generic_OSS/options b/projects/Generic_OSS/options
index a83838fa05..147eb49306 100644
--- a/projects/Generic_OSS/options
+++ b/projects/Generic_OSS/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 nvidia nouveau"
diff --git a/projects/ION/options b/projects/ION/options
index b475b708f6..4df9c62ecf 100644
--- a/projects/ION/options
+++ b/projects/ION/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
diff --git a/projects/Intel/options b/projects/Intel/options
index 66fe18c6bb..3628f5c64e 100644
--- a/projects/Intel/options
+++ b/projects/Intel/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"
diff --git a/projects/Ultra/options b/projects/Ultra/options
index 91c0da9129..4bdf145579 100644
--- a/projects/Ultra/options
+++ b/projects/Ultra/options
@@ -184,6 +184,9 @@
 # Displayserver to use (xorg-server / no)
   DISPLAYSERVER="xorg-server"
 
+# Windowmanager to use (ratpoison / none)
+  WINDOWMANAGER="ratpoison"
+
 # Graphic drivers to use (all / i915,i965,r200,r300,r600,fglrx,nvidia,nouveau,vmware)
 # Space separated list is supported,
 # e.g. GRAPHIC_DRIVERS="i915 i965 r300 r600 radeon nvidia nouveau"