diff --git a/config/options b/config/options
index be1b169e2e..56fb587d18 100644
--- a/config/options
+++ b/config/options
@@ -114,14 +114,11 @@ NDISWRAPPER=no
 # Allow use of WPA_Supplicant for WPA-PSK secured wireless networks (yes/no)
 WPA_SUPPLICANT=yes
 
-
-
 # X.org drivers to use (all/ati/geode/glint/i740/intel/mga/nv/openchrome/
 # radeonhd/s3/s3virge/savage/sis/tdfx/trident/vesa/vmware)
 # Space separated list is supported, e.g. XORG_DRIVERS="ati s3"
 XORG_DRIVERS="ati nouveau nv vesa openchrome intel"
 
-
 # LCD display support (yes/no)
 LCD4LINUX=yes
 
@@ -137,9 +134,6 @@ LCD_MODEL=HD44780-winamp
 LCD_WIDTH=16
 LCD_HEIGHT=2
 
-DEBUG=no
-DEVTOOLS=no
-
 # verbose compilation mode (yes/no)
 VERBOSE=yes
 
@@ -151,4 +145,12 @@ AUTOUPDATE=ask
 #  multi-processor computer (like hyperthreading SMP CPU)
 CONCURRENCY_MAKE_LEVEL=1
 
+# Select building with Debug Support
+# (this is on by default if VERSION contains "debug")
+DEBUG=no
+
+# Select building of Development and Testtools
+# (this is on by default if VERSION contains "devel" or "debug")
+DEVTOOLS=no
+
 . config/path
diff --git a/config/path b/config/path
index c9ba4801dc..917ac53ff8 100644
--- a/config/path
+++ b/config/path
@@ -14,7 +14,7 @@ SCRIPTS=scripts
 PACKAGES=packages
 SOURCES=sources
 BUILD_BASE=build
-BUILD=$BUILD_BASE.OpenELEC.$PROJECT.$TARGET_ARCH.$TARGET_LIBC
+BUILD=$BUILD_BASE.OpenELEC.$PROJECT.$TARGET_ARCH.$TARGET_LIBC.$OPENELEC_VERSION
 [ -n "$TARGET_PLATFORM" ] && BUILD=$BUILD.$TARGET_PLATFORM
 PKG_BUILD=$BUILD/$1\[-_][0-9\|\<svn\>\|\<git\>]*
 STAMPS_NOARCH=.stamps
@@ -30,6 +30,9 @@ TARGET_PREFIX=$ROOT/$TOOLCHAIN/bin/$TARGET_NAME-
 if [ "$OPENELEC_VERSION" = devel ]; then
  DEBUG=no
  DEVTOOLS=yes
+elif [ "$OPENELEC_VERSION" = debug ]; then
+ DEBUG=yes
+ DEVTOOLS=yes
 fi
 
 HOST_NAME_CACHE=$BUILD/configtools/host_name
@@ -88,15 +91,15 @@ TARGET_CFLAGS="$GCC_OPTIM -Wall -pipe -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
 TARGET_CXXFLAGS="$TARGET_CFLAGS"
 TARGET_LDFLAGS=
 
-#if [ "$DEBUG" = yes ]; then
-#  TARGET_CFLAGS="$TARGET_CFLAGS -g3"
-#  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -g3"
-#  TARGET_STRIP=true
-#else
+if [ "$DEBUG" = yes ]; then
+  TARGET_CFLAGS="$TARGET_CFLAGS -g3"
+  TARGET_CXXFLAGS="$TARGET_CXXFLAGS -g3"
+  TARGET_STRIP=true
+else
   TARGET_CFLAGS="$TARGET_CFLAGS -s -fomit-frame-pointer"
   TARGET_CXXFLAGS="$TARGET_CXXFLAGS -s -fomit-frame-pointer"
   TARGET_LDFLAGS="$TARGET_LDFLAGS -s"
-#fi
+fi
 
 HOST_AWK=gawk
 HOST_CC=$ROOT/$TOOLCHAIN/bin/host-gcc
diff --git a/packages/virtual/image/install b/packages/virtual/image/install
index 792792622e..f9bdc9e0e1 100755
--- a/packages/virtual/image/install
+++ b/packages/virtual/image/install
@@ -3,8 +3,11 @@
 . config/options
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
+
 [ "$OPENELEC_VERSION" = devel ] && \
   OPENELEC_VERSION=$OPENELEC_VERSION-`date +%Y%m%d`-r`bzr version-info --custom --template={revno}`
+[ "$OPENELEC_VERSION" = debug ] && \
+  OPENELEC_VERSION=$OPENELEC_VERSION-`date +%Y%m%d`-r`bzr version-info --custom --template={revno}`
 
 case "$2" in
   system)
@@ -44,7 +47,7 @@ case "$2" in
 
 # Audio Driver...
     $SCRIPTS/install alsa
-#    $SCRIPTS/install test
+    $SCRIPTS/install test
 
 # Xorg...
     $SCRIPTS/install Xorg
@@ -74,10 +77,8 @@ case "$2" in
 
 # Devtools... (not for Release)
    [ "$DEVTOOLS" = yes ] && $SCRIPTS/install gdb
-#   [ "$DEVTOOLS" = yes ] && $SCRIPTS/install mrxvt
-   [ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm
    [ "$DEVTOOLS" = yes ] && $SCRIPTS/install pciutils
-   [ "$DEVTOOLS" = yes ] && $SCRIPTS/install driconf
+#   [ "$DEVTOOLS" = yes ] && $SCRIPTS/install driconf
 
 # Devtools for Cooreboot... (not for Release)
    [ "$DEVTOOLS" = yes ] && $SCRIPTS/install superiotool