diff --git a/cmake/Rpm.cmake b/cmake/Rpm.cmake
index 44e50bd6e..83843ad79 100644
--- a/cmake/Rpm.cmake
+++ b/cmake/Rpm.cmake
@@ -6,7 +6,7 @@ set(RPM_ARCH x86_64 CACHE STRING "Architecture of the rpm file")
 
 add_custom_target(rpm
   COMMAND ${CMAKE_SOURCE_DIR}/dist/maketarball.sh
-  COMMAND ${CMAKE_COMMAND} -E copy clementine-${CLEMENTINE_VERSION_SPARKLE}.tar.gz ${RPMBUILD_DIR}/SOURCES/
+  COMMAND ${CMAKE_COMMAND} -E copy clementine-${CLEMENTINE_VERSION_SPARKLE}.tar.xz ${RPMBUILD_DIR}/SOURCES/
   COMMAND rpmbuild -bs ${CMAKE_SOURCE_DIR}/dist/clementine.spec
   COMMAND ${MOCK_COMMAND}
       --verbose
diff --git a/dist/clementine.spec.in b/dist/clementine.spec.in
index b9098049f..da8407e7b 100644
--- a/dist/clementine.spec.in
+++ b/dist/clementine.spec.in
@@ -6,7 +6,7 @@ Summary:        A music player and library organiser
 Group:          Applications/Multimedia
 License:        GPLv3
 URL:            http://www.clementine-player.org/
-Source0:        %{name}-@CLEMENTINE_VERSION_SPARKLE@.tar.gz
+Source0:        %{name}-@CLEMENTINE_VERSION_SPARKLE@.tar.xz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  desktop-file-utils liblastfm-devel taglib-devel gettext
diff --git a/dist/maketarball.sh.in b/dist/maketarball.sh.in
index 9a6866456..9b23a52ac 100755
--- a/dist/maketarball.sh.in
+++ b/dist/maketarball.sh.in
@@ -7,16 +7,17 @@ root=$(cd "${0%/*}/.." && echo $PWD/${0##*/})
 root=`dirname "$root"`
 rootnoslash=`echo $root | sed "s/^\///"`
 
-echo "Creating $name-$version.tar.gz..."
+echo "Creating $name-$version.tar.xz..."
 
-tar -czf $name-$version.tar.gz "$root" \
+tar -cJf $name-$version.tar.xz "$root" \
     --transform "s,^$rootnoslash,$name-$version," \
     --exclude-vcs \
     --exclude "$root/bin/*" \
     --exclude "$root/debian" \
     --exclude "$root/dist/*.tar.gz" \
+    --exclude "$root/dist/*.tar.xz" \
     --exclude "$root/CMakeLists.txt.user"
 
-echo "Also creating ${name}_${version}~${deb_dist}.orig.tar.gz..."
-cp "$name-$version.tar.gz" "${name}_${version}~${deb_dist}.orig.tar.gz"
+echo "Also creating ${name}_${version}~${deb_dist}.orig.tar.xz..."
+cp "$name-$version.tar.xz" "${name}_${version}~${deb_dist}.orig.tar.xz"
 
diff --git a/dist/uploadtoppa.sh b/dist/uploadtoppa.sh
index a53a3ae0d..11a2a5cbc 100755
--- a/dist/uploadtoppa.sh
+++ b/dist/uploadtoppa.sh
@@ -16,7 +16,7 @@ BASE=`pwd`
 DIRECTORY=clementine
 
 # Cleanup any old stuff
-rm -rfv $BASE/$DIRECTORY $BASE/*.diff.gz $BASE/*.tar.gz $BASE/*.dsc $BASE/*_source.changes
+rm -rfv $BASE/$DIRECTORY $BASE/*.diff.*z $BASE/*.tar.*z $BASE/*.dsc $BASE/*_source.changes
 
 # Checkout
 git clone $REPO $DIRECTORY
@@ -32,8 +32,8 @@ rm -rfv $BASE/$DIRECTORY/bin/*
 # Create the tarball
 cd $BASE/$DIRECTORY/dist
 ./maketarball.sh
-mv -v $BASE/$DIRECTORY/dist/*.orig.tar.gz $BASE/
-rm -v $BASE/$DIRECTORY/dist/*.tar.gz
+mv -v $BASE/$DIRECTORY/dist/*.orig.tar.xz $BASE/
+rm -v $BASE/$DIRECTORY/dist/*.tar.*z
 rm -vrf $BASE/$DIRECTORY/.git
 
 # Build the deb