diff --git a/packages/virtual/debug/package.mk b/packages/virtual/debug/package.mk
index 1a8619924c..c2ced9e9dc 100644
--- a/packages/virtual/debug/package.mk
+++ b/packages/virtual/debug/package.mk
@@ -38,6 +38,6 @@ if [ "$VDPAU_SUPPORT" = "yes" -a "$DISPLAYSERVER" = "x11" ]; then
   PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET vdpauinfo"
 fi
 
-if [ "$DEBUG" = "yes" ]; then
-  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET  valgrind"
+if [ "$DEBUG" = "yes" -a "$VALGRIND" = "yes" ]; then
+  PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET valgrind"
 fi
diff --git a/projects/RPi/options b/projects/RPi/options
index 266f8d656d..6570a08f17 100644
--- a/projects/RPi/options
+++ b/projects/RPi/options
@@ -129,6 +129,10 @@
   # build with installer (yes / no)
     INSTALLER_SUPPORT="no"
 
+  # build debug with valgrind (yes / no)
+  # Not available for armv6. Increases image size significantly
+    VALGRIND="no"
+
   # kernel image name
     KERNEL_NAME="kernel.img"