diff --git a/tools/mkpkg/update_binary-addons-retroplayer b/tools/mkpkg/update_binary-addons-retroplayer
index 6e467148af..1e11fc33d3 100755
--- a/tools/mkpkg/update_binary-addons-retroplayer
+++ b/tools/mkpkg/update_binary-addons-retroplayer
@@ -47,51 +47,32 @@ resolve_hash() {
   fi
 }
 
-# addons
-for addontxt in "binary-addons https://github.com/lrusak/repo-binary-addons.git retroplayer" ; do
+if [ -z "$1" ]; then
+  echo "Usage: $0 <emulator-name>"
+  exit 0
+else
+  addontxt="binary-addons https://github.com/lrusak/repo-binary-addons.git retroplayer"
   ADDONS=$(echo $addontxt | awk '{print $1}')
   ADDONREPO=$(echo $addontxt | awk '{print $2}')
   GIT_HASH=$(echo $addontxt | awk '{print $3}')
   git_clone $ADDONREPO retroplayer $ADDONS.git $GIT_HASH
 
-  if [ -z "$1" ]; then
-    for addon in $ADDONS.git/*.*/ ; do
-      if [ -n "$(echo $addon | grep game.)" -o -n "$(echo $addon | grep peripheral.)" ]; then
-        ADDON=$(basename $addon)
-        REPO=$(cat $addon/$ADDON.txt | awk '{print $2}')
-        GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}')
+  addon="$ADDONS.git/$1"
+  if [ -n "$(echo $addon | grep game.)" -o -n "$(echo $addon | grep peripheral.)" ]; then
+    ADDON=$(basename $addon)
+    REPO=$(cat $addon/$ADDON.txt | awk '{print $2}')
+    GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}')
 
-        if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then
-          continue
-        fi
+    if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then
+      continue
+    fi
 
-        git_clone $REPO master $ADDON.git $GIT_HASH
+    git_clone $REPO master $ADDON.git $GIT_HASH
 
-        if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
-          # update package.mk
-          RESOLVED_HASH=$(resolve_hash $ADDON.git $GIT_HASH)
-          sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
-        fi
-      fi
-    done
-  else
-    addon="$ADDONS.git/$1"
-    if [ -n "$(echo $addon | grep game.)" -o -n "$(echo $addon | grep peripheral.)" ]; then
-      ADDON=$(basename $addon)
-      REPO=$(cat $addon/$ADDON.txt | awk '{print $2}')
-      GIT_HASH=$(cat $addon/$ADDON.txt | awk '{print $3}')
-
-      if ! grep -q all $addon/platforms.txt && ! grep -q linux $addon/platforms.txt && ! grep -q ! $addon/platforms.txt; then
-        continue
-      fi
-
-      git_clone $REPO master $ADDON.git $GIT_HASH
-
-      if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
-        # update package.mk
-        RESOLVED_HASH=$(resolve_hash $ADDON.git $GIT_HASH)
-        sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
-      fi
+    if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
+      # update package.mk
+      RESOLVED_HASH=$(resolve_hash $ADDON.git $GIT_HASH)
+      sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk
     fi
   fi
-done
+fi
diff --git a/tools/mkpkg/update_emulation b/tools/mkpkg/update_emulation
index 5913a6ba43..6a9ea431e0 100755
--- a/tools/mkpkg/update_emulation
+++ b/tools/mkpkg/update_emulation
@@ -47,16 +47,8 @@ resolve_hash() {
 }
 
 if [ -z "$1" ]; then
-  for package in $(find ../../packages/emulation/* -name package.mk); do
-    . $package
-    git_clone $PKG_SITE master $PKG_NAME.git
-
-    if [ -f ../../packages/emulation/$PKG_NAME/package.mk ] ; then
-      # update package.mk
-      RESOLVED_HASH=$(resolve_hash $PKG_NAME.git master)
-      sed -i "s|PKG_VERSION=.*|PKG_VERSION=\"$RESOLVED_HASH\"|g" ../../packages/emulation/$PKG_NAME/package.mk
-    fi
-  done
+  echo "Usage: $0 <emulator-name>"
+  exit 0
 else
   . ../../packages/emulation/$1/package.mk
   git_clone $PKG_SITE master $PKG_NAME.git