diff --git a/stpkg b/stpkg
index 019cd905cd1c864bd31a1f43da3019f6d2aa3dcc..8e93c6fb1826cf821dcdade7d06f2fc4e51bd544 100755
--- a/stpkg
+++ b/stpkg
@@ -625,7 +625,7 @@ process_sticker_file() {
     #progress "($CURRENT_FILE/$TOTAL_FILES) $NAME "
     #local CURRENT_FILE=$[ $CURRENT_FILE + 1 ]
 
-    if [ "x${STPKG_TRUST_SOURCE}" = "xyes" ]; then
+    if [ "x${STPKG_NOCONVERT_FILE}" = "xyes" ]; then
         #
         # Don't convert image, upload it as it is
         #
@@ -810,7 +810,11 @@ __pack() {
 
     for i in `cat $TEMP_CHECK | grep ': OK$' | sed 's/\(.*\): OK/\1/'`; do
         if [ "x$i" = "x" ]; then continue; fi
-        unchangedFiles["$i"]="${hashes["$i"]}"
+        if [ "x$STPKG_REUPLOAD_SAME_FILE" = "xyes" ]; then
+            updatedFiles["$i"]="${hashes["$i"]}"
+        else
+            unchangedFiles["$i"]="${hashes["$i"]}"
+        fi
         unset hashes["$i"]
         skipFiles[$i]=""
     done
@@ -915,6 +919,9 @@ __do_command() {
             ;;&
 
         edit|pack)
+            local CURRCOMMAND="$1"
+            shift
+
             # Home server
             STPKG_HOMESERV=${STPKG_HOMESERV:="matrix.org"}
             STPKG_HOMESERV=`echo "$STPKG_HOMESERV" | iconv -c -t ascii//TRANSLIT | sed -e 's/^http:\/\/|^https:\/\///g' -e 's/^-+|-+$//g'`
@@ -949,8 +956,8 @@ __do_command() {
                         ;;
 
                     # Do we need to resize/convert the files we are given?
-                    -trust)
-                        STPKG_TRUST_SOURCE="yes"
+                    -noconvert)
+                        STPKG_NOCONVERT_FILE="yes"
                         shift
                         ;;
 
@@ -988,11 +995,14 @@ __do_command() {
             # Default values
             STPKG_MAX_WIDTH=${STPKG_MAX_WIDTH:="256"}
             STPKG_MAX_HEIGHT=${STPKG_MAX_HEIGHT:="128"}
-            STPKG_TRUST_SOURCE=${STPKG_TRUST_SOURCE:="no"}
+            STPKG_NOCONVERT_FILE=${STPKG_NOCONVERT_FILE:="no"}
             STPKG_GENERATE_PREVIEW=${STPKG_GENERATE_PREVIEW:="no"}
             STPKG_IMAGE_TARGET_FILETYPE=${STPKG_IMAGE_TARGET_FILETYPE:="image/png"}
             STPKG_ANIMATED_TARGET_FILETYPE=${STPKG_ANIMATED_TARGET_FILETYPE:="image/gif"}
             STPKG_REUPLOAD_SAME_FILE=${STPKG_REUPLOAD_SAME_FILE:="no"}
+
+            __$CURRCOMMAND $*
+            exit
             ;;&
 
         *)