diff --git a/config/functions b/config/functions
index f308f3c9c0..b47329288d 100644
--- a/config/functions
+++ b/config/functions
@@ -165,11 +165,6 @@ reset_pkg_vars() {
   done
   [ -n "${vars}" ] && unset -v ${vars}
 
-  if [ -n "$1" ]; then
-    PKG_NAME="$1"
-    PKG_SHORTDESC="$1 (autogenerated)"
-    PKG_LONGDESC="$1 (autogenerated)"
-  fi
   PKG_VERSION="0.0invalid"
   PKG_REV="0"
   PKG_ARCH="any"
diff --git a/config/path b/config/path
index fcac35e1ec..e3a768f136 100644
--- a/config/path
+++ b/config/path
@@ -113,6 +113,8 @@ unset LD_LIBRARY_PATH
 
   if [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ]; then
     . $PKG_DIR/package.mk
+    [ -z "$PKG_SHORTDESC" ] && PKG_SHORTDESC="$PKG_NAME (autogenerated)"
+    [ -z "$PKG_LONGDESC" ] &&  PKG_LONGDESC="$PKG_NAME (autogenerated)"
   fi
 
   if [ "$PKG_IS_ADDON" = "yes" ] ; then
diff --git a/scripts/checkdeps b/scripts/checkdeps
index 6a1d06f09d..194d5dabf6 100755
--- a/scripts/checkdeps
+++ b/scripts/checkdeps
@@ -18,7 +18,7 @@
 #  along with OpenELEC.  If not, see <http://www.gnu.org/licenses/>.
 ################################################################################
 
-. config/options $1
+. config/options ""
 
 get_deps() {
   need=()
diff --git a/scripts/image b/scripts/image
index 9d0ccc9517..83d9391f78 100755
--- a/scripts/image
+++ b/scripts/image
@@ -20,7 +20,7 @@
 
 unset _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
 
-. config/options $1
+. config/options TRIGGER_POPULATION_OF_CACHE_PACKAGE
 
 . config/show_config
 show_config