diff --git a/addon_submitter/utils.py b/addon_submitter/utils.py
index 675e718..439fb68 100755
--- a/addon_submitter/utils.py
+++ b/addon_submitter/utils.py
@@ -58,11 +58,15 @@ def create_zip(zip_name, addon_id, subdirectory):
     """
     logger.info('Creating ZIP file...')
     if subdirectory:
-        shell('git', 'archive', '-o', '{}.zip'.format(zip_name), 'HEAD', '--',
-              addon_id)
+        shell(
+            'sh', '-c',
+            'HASH=$(git stash create); git archive -o %s.zip ${HASH:-HEAD} -- %s' % (zip_name, addon_id)
+        )
     else:
-        shell('git', 'archive', '-o', '{}.zip'.format(zip_name),
-              '--prefix', '{}/'.format(addon_id), 'HEAD')
+        shell(
+            'sh', '-c',
+            'HASH=$(git stash create); git archive -o %s.zip --prefix %s/ ${HASH:-HEAD}' % (zip_name, addon_id)
+        )
     logger.info('ZIP created successfully.')