diff --git a/config/options b/config/options
index 7cd5b37f7b..c93e3ba744 100644
--- a/config/options
+++ b/config/options
@@ -76,9 +76,6 @@ LINUX_DEPENDS="$PROJECT_DIR/$PROJECT/linux/linux.$TARGET_ARCH.conf $ROOT/package
 # the nearest multiple of 16 kilobytes.
   CCACHE_CACHE_SIZE="30G"
 
-# forcing install of all packages (yes/no)
-  FORCE_INSTALL="no"
-
 # install devtools on development builds
   if [ "$OPENELEC_VERSION" = "devel" ]; then
     DEVTOOLS=yes
diff --git a/scripts/image b/scripts/image
index 2bd9d87645..50cc9a0fbf 100755
--- a/scripts/image
+++ b/scripts/image
@@ -87,15 +87,8 @@ fi
     ln -s lib $INSTALL/usr/lib64
   fi
 
-  echo "$DISTRONAME" > $INSTALL/etc/distribution
-  echo "$PROJECT.$TARGET_ARCH" > $INSTALL/etc/arch
-  echo "$OPENELEC_VERSION" > $INSTALL/etc/version
   echo "$TARGET_VERSION" > $INSTALL/etc/release
-  echo "$DISTRONAME ($([ "$OFFICIAL" = "yes" ] && echo "official" ||  echo "unofficial")) - Version: $OPENELEC_VERSION" > $INSTALL/etc/openelec-release
-  if [ -n "$GIT_HASH" ]; then
-    echo "$GIT_HASH" >> $INSTALL/etc/gitrev
-  fi
-  
+
 # create /etc/os-release
   echo -e "NAME=\"$DISTRONAME\"" > $INSTALL/etc/os-release
   echo -e "VERSION=\"$OPENELEC_VERSION\"" >> $INSTALL/etc/os-release
@@ -114,12 +107,6 @@ fi
     echo -e "OPENELEC_BUILD=\"unofficial\"" >> $INSTALL/etc/os-release
   fi
 
-  if [ "$OFFICIAL" = "yes" ]; then
-    echo "official" > $INSTALL/etc/build
-  else
-    echo "unofficial" > $INSTALL/etc/build
-  fi
-
 # create /etc/issue
   echo $GREETING0 >  $INSTALL/etc/issue
   echo $GREETING1 >> $INSTALL/etc/issue
diff --git a/scripts/install b/scripts/install
index 760e5dc213..c4ae58d64d 100755
--- a/scripts/install
+++ b/scripts/install
@@ -32,20 +32,16 @@ if [ -z "$INSTALL" ] ; then
 fi
 
 # set defaults
-  PACKAGE_NAME=$(echo $1 | awk -F : '{print $1}')
-  TARGET=$(echo $1 | awk -F : '{print $2}')
-  if [ -z "$TARGET" ]; then
-    TARGET="target"
-  fi
+PACKAGE_NAME=$(echo $1 | awk -F : '{print $1}')
+TARGET=$(echo $1 | awk -F : '{print $2}')
+if [ -z "$TARGET" ]; then
+  TARGET="target"
+fi
 
 STAMP=$STAMPS_INSTALL/$PACKAGE_NAME/install_$TARGET
 mkdir -p $STAMPS_INSTALL/$PACKAGE_NAME
 
-if [ -f $STAMP -a $PKG_DIR/install -nt $STAMP ]; then
-  rm -f $STAMP
-fi
-
-[ -f $STAMP -a $FORCE_INSTALL = "no" ] && exit 0
+[ -f $STAMP ] && exit 0
 
 if [ -n "$PKG_ARCH" -a ! "$PKG_ARCH" = "any" ]; then
   echo "$PKG_ARCH" | grep -q "$TARGET_ARCH" || exit 0
@@ -123,45 +119,41 @@ if [ "$TARGET" = target ] ; then
 
   if [ -d $PKG_DIR/debug.d ]; then
     mkdir -p $INSTALL/usr/share/debugconf
-      cp $PKG_DIR/debug.d/*.conf $INSTALL/usr/share/debugconf
+    cp $PKG_DIR/debug.d/*.conf $INSTALL/usr/share/debugconf
   fi
 
   if [ -d $PKG_DIR/modprobe.d ]; then
     mkdir -p $INSTALL/lib/modprobe.d
     cp $PKG_DIR/modprobe.d/*.conf $INSTALL/lib/modprobe.d
   fi
-
 fi
 
 # unset functions
-  unset -f pre_install
-  unset -f post_install
+unset -f pre_install
+unset -f post_install
 
 # include buildfile
-  . $PKG_DIR/package.mk
+. $PKG_DIR/package.mk
 
 # install
-  if [ "$TARGET" = target ] ; then
-    if [ "$(type -t pre_install)" = "function" ]; then
-      pre_install
-    fi
+if [ "$TARGET" = target ] ; then
+  if [ "$(type -t pre_install)" = "function" ]; then
+    pre_install
   fi
+fi
 
-  if [ "$TARGET" = "target" -a -d $PKG_BUILD/.install_pkg ]; then
-    mkdir -p $INSTALL
-      cp -PR $PKG_BUILD/.install_pkg/* $INSTALL
-  elif [ "$TARGET" = "init" -a -d $PKG_BUILD/.install_init ]; then
-    mkdir -p $INSTALL
-      cp -PR $PKG_BUILD/.install_init/* $INSTALL
+if [ "$TARGET" = "target" -a -d $PKG_BUILD/.install_pkg ]; then
+  mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install_pkg/* $INSTALL
+elif [ "$TARGET" = "init" -a -d $PKG_BUILD/.install_init ]; then
+  mkdir -p $INSTALL
+  cp -PR $PKG_BUILD/.install_init/* $INSTALL
+fi
+
+if [ "$TARGET" = target ] ; then
+  if [ "$(type -t post_install)" = "function" ]; then
+    post_install
   fi
+fi
 
-  if [ "$TARGET" = target ] ; then
-    if [ "$(type -t post_install)" = "function" ]; then
-      post_install
-    fi
-  fi
-
-for i in `sed -n "s/^\([^#].*\)=\".*$/\1/p" $PROJECT_DIR/$PROJECT/options | grep -v "#"`; do
-  eval val=\$$i
-  echo "STAMP_$i=\"$val"\" >> $STAMP
-done
+touch $STAMP
diff --git a/scripts/unpack b/scripts/unpack
index f75c973b7f..47452dc76c 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -58,44 +58,45 @@ printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 # unset functions
-  unset -f pre_unpack
-  unset -f unpack
-  unset -f post_unpack
-  unset -f pre_patch
-  unset -f post_patch
+unset -f pre_unpack
+unset -f unpack
+unset -f post_unpack
+unset -f pre_patch
+unset -f post_patch
 
-  . $PKG_DIR/package.mk
+. $PKG_DIR/package.mk
 
-  if [ "$(type -t pre_unpack)" = "function" ]; then
-    pre_unpack
-  fi
+if [ "$(type -t pre_unpack)" = "function" ]; then
+  pre_unpack
+fi
 
-  if [ "$(type -t unpack)" = "function" ]; then
-    unpack
-  else
-    if [ -n "$PKG_URL" ]; then
-      $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
-      $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
-      $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
-      $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
-      $SCRIPTS/extract $1 "$1*.txz"     $BUILD
-      $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
-      $SCRIPTS/extract $1 "$1*.7z"      $BUILD
-      $SCRIPTS/extract $1 "$1*.zip"     $BUILD
-    fi
+if [ "$(type -t unpack)" = "function" ]; then
+  unpack
+else
+  if [ -n "$PKG_URL" ]; then
+    $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+    $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+    $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+    $SCRIPTS/extract $1 "$1*.txz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.7z"      $BUILD
+    $SCRIPTS/extract $1 "$1*.zip"     $BUILD
   fi
+fi
 
-  if [ -n "$PKG_SOURCE_DIR" ]; then
-    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-  fi
+if [ -n "$PKG_SOURCE_DIR" ]; then
+  mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+fi
 
-  if [ -d "$PKG_DIR/sources" ]; then
-    [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
-    cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
-  fi
-  if [ "$(type -t post_unpack)" = "function" ]; then
-    post_unpack
-  fi
+if [ -d "$PKG_DIR/sources" ]; then
+  [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+  cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+fi
+
+if [ "$(type -t post_unpack)" = "function" ]; then
+  post_unpack
+fi
 
 if [ "$(type -t pre_patch)" = "function" ]; then
   pre_patch