diff --git a/config/options b/config/options
index 865c6ed7d8..e432f1e560 100644
--- a/config/options
+++ b/config/options
@@ -109,6 +109,8 @@ if [ "$OEM" = yes -o "$OEM" = no ]; then
   OEM_SUPPORT=$OEM
 fi
 
+[ -z ${_DEBUG_DEPENDS_LIST+x} ] && set_debug_depends
+
 check_path >&2
 check_config >&2
 
diff --git a/scripts/image b/scripts/image
index 550d6fb8a8..d56b8258a7 100755
--- a/scripts/image
+++ b/scripts/image
@@ -18,7 +18,7 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
+unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL _DEBUG_DEPENDS_LIST _DEBUG_PACKAGE_LIST
 
 . config/options ""