diff --git a/create_tarball b/create_tarball
index 19a2209..1233b1d 100755
--- a/create_tarball
+++ b/create_tarball
@@ -15,9 +15,9 @@ TARBALL_DIR=${TARBALL_DIR:-".."}
 
 # Set compression method
 case ${COMPRESS:="xz"} in
-  "gzip"|"pigz") TAR_SUFFIX="gz";;
-  "bzip2"|"pbzip2") TAR_SUFFIX="bz2";;
-  "xz"|"pxz") TAR_SUFFIX="xz";;
+  "gzip"*|"pigz"*) TAR_SUFFIX=".gz";;
+  "bzip2"|"pbzip2") TAR_SUFFIX=".bz2";;
+  "xz"|"pxz") TAR_SUFFIX=".xz";;
 esac
 
 # Check git-dir
@@ -149,18 +149,25 @@ fi
 
 # Create tarball
 echo "Package name: $package"
-if [ ! -e $TARBALL_DIR/$package.tar.$TAR_SUFFIX ]; then
+if [ ! -e $TARBALL_DIR/$package.tar$TAR_SUFFIX ]; then
   echo "Creating tarball in $TARBALL_DIR."
   echo "# TDE SCM module information" > .tdescminfo
   echo "Name: $MODULE" >> .tdescminfo
   echo "Revision: $branch-$(git rev-parse HEAD)" >> .tdescminfo
   git log -1 --pretty=format:"DateTime: %cd%n" --date=format:"%m/%d/%Y %H:%M" >> .tdescminfo
   trap "rm $TARBALL_DIR/tar-$$; rm .tdescminfo; exit 1" INT
-  tar c --owner=root --group=users --exclude .git --exclude .gitmodules --transform "s|^\.\(/\|$\)|$package\1|" ./ | \
+  find ./ -print0 | LC_ALL=C sort -z | \
+  tar c --no-recursion --null -T - \
+    --mtime "@$(git log -1 --pretty=format:"%ct")" \
+    --owner=root --group=users --exclude .git --exclude .gitmodules \
+    --pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime \
+    --transform "s|^\.\(/\|$\)|$package\1|" ./ | \
   $COMPRESS -9 >$TARBALL_DIR/tar-$$ && \
-  mv $TARBALL_DIR/tar-$$ $TARBALL_DIR/$package.tar.$TAR_SUFFIX || \
+  mv $TARBALL_DIR/tar-$$ $TARBALL_DIR/$package.tar$TAR_SUFFIX || \
   rm $TARBALL_DIR/tar-$$
   rm .tdescminfo
+  [ -f $TARBALL_DIR/$package.tar$TAR_SUFFIX ] && \
+  touch -d "@$(git log -1 --pretty=format:"%ct")" $TARBALL_DIR/$package.tar$TAR_SUFFIX
 else
   echo "Unchanged tarball in $TARBALL_DIR."
   exit 2