diff --git a/packaging/linux/appimage/build-deps.sh b/packaging/linux/appimage/build-deps.sh
index a106d5ed9b..4e4cc28bd7 100644
--- a/packaging/linux/appimage/build-deps.sh
+++ b/packaging/linux/appimage/build-deps.sh
@@ -1,123 +1,122 @@
 #!/bin/bash
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
 # ./AppImageKit/build.sh 
 # sudo ./AppImageKit/AppImageAssistant.AppDir/testappimage /isodevice/boot/iso/CentOS-6.5-x86_64-LiveCD.iso bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
 # Now we are inside CentOS 6
 grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
 export LANG=en_us.UTF-8
 
 # Determine which architecture should be built
 if [[ "$(arch)" = "i686" || "$(arch)" = "x86_64" ]] ; then
   ARCH=$(arch)
 else
   echo "Architecture could not be determined"
   exit 1
 fi
 
 # if the library path doesn't point to our usr/lib, linking will be broken and we won't find all deps either
 export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/krita.appdir/usr/lib
 
 git_pull_rebase_helper()
 {
 	git reset --hard HEAD
         git pull
 }
 
 yum -y install epel-release 
 # we need to be up to date in order to install the xcb-keysyms dependency
 yum -y update
 # base dependencies and Qt5.
-yum -y install wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake libtool mesa-libEGL cppunit-devel cmake3 glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel libXi-devel mesa-libGL-devel mesa-libGLU-devel libxcb libxcb-devel xcb-util xcb-util-devel glibc-devel xkeyboard-config
+yum -y install wget tar bzip2 git libtool which fuse fuse-devel libpng-devel automake libtool mesa-libEGL cppunit-devel cmake3 glibc-headers libstdc++-devel gcc-c++ freetype-devel fontconfig-devel libxml2-devel libstdc++-devel libXrender-devel patch xcb-util-keysyms-devel libXi-devel mesa-libGL-devel libxcb libxcb-devel xcb-util xcb-util-devel
 
 
 # Newer compiler than what comes with CentOS 6
 yum -y install centos-release-scl-rh
 yum -y install devtoolset-3-gcc devtoolset-3-gcc-c++
 . /opt/rh/devtoolset-3/enable
 
 # Make sure we build from the /, parts of this script depends on that. We also need to run as root...
 cd  /
 
 # Build AppImageKit
 if [ ! -d AppImageKit ] ; then
   git clone  --depth 1 https://github.com/probonopd/AppImageKit.git /AppImageKit
 fi
 
 cd /AppImageKit/
 git_pull_rebase_helper
-git checkout stable/v1.0
 ./build.sh
 cd /
 
 
 # Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
 # However, this is where .pc files get installed when bulding libraries... (FIXME)
 # I found this by comparing the output of librevenge's "make install" command
 # between Ubuntu and CentOS 6
 ln -sf /usr/share/pkgconfig /usr/lib/pkgconfig
 
 
 # A krita build layout looks like this:
 # krita/ -- the source directory
 # krita/3rdparty -- the cmake3 definitions for the dependencies
 # d -- downloads of the dependencies from files.kde.org
 # b -- build directory for the dependencies
 # krita_build -- build directory for krita itself
 # krita.appdir -- install directory for krita and the dependencies
 
 # Get Krita
 if [ ! -d /krita ] ; then
 	git clone  --depth 1 https://github.com/KDE/krita.git /krita
 fi
 
 cd /krita/
 git_pull_rebase_helper
 
 # Create the build dir for the 3rdparty deps
 if [ ! -d /b ] ; then
     mkdir /b
 fi    
 if [ ! -d /d ] ; then
     mkdir /d
 fi
 
 # start building the deps
 cd /b
 
 rm -rf /b/* || true
 
 cmake3 /krita/3rdparty \
     -DCMAKE_INSTALL_PREFIX:PATH=/usr \
     -DINSTALL_ROOT=/usr \
     -DEXTERNALS_DOWNLOAD_DIR=/d
     
 cmake3 --build . --config RelWithDebInfo --target ext_qt
-cmake3 --build . --config RelWithDebInfo --target ext_boost
-cmake3 --build . --config RelWithDebInfo --target ext_eigen3
-cmake3 --build . --config RelWithDebInfo --target ext_exiv2
-cmake3 --build . --config RelWithDebInfo --target ext_fftw3
-cmake3 --build . --config RelWithDebInfo --target ext_lcms2
-cmake3 --build . --config RelWithDebInfo --target ext_ocio
-cmake3 --build . --config RelWithDebInfo --target ext_openexr
-cmake3 --build . --config RelWithDebInfo --target ext_vc
+#cmake3 --build . --config RelWithDebInfo --target ext_boost
+#cmake3 --build . --config RelWithDebInfo --target ext_eigen3
+#cmake3 --build . --config RelWithDebInfo --target ext_exiv2
+#cmake3 --build . --config RelWithDebInfo --target ext_fftw3
+#cmake3 --build . --config RelWithDebInfo --target ext_lcms2
+#cmake3 --build . --config RelWithDebInfo --target ext_ocio
+#cmake3 --build . --config RelWithDebInfo --target ext_openexr
+#cmake3 --build . --config RelWithDebInfo --target ext_vc
 #cmake3 --build . --config RelWithDebInfo --target ext_png
-cmake3 --build . --config RelWithDebInfo --target ext_tiff
-cmake3 --build . --config RelWithDebInfo --target ext_jpeg
-cmake3 --build . --config RelWithDebInfo --target ext_libraw
-cmake3 --build . --config RelWithDebInfo --target ext_kcrash
-cmake3 --build . --config RelWithDebInfo --target ext_poppler
-cmake3 --build . --config RelWithDebInfo --target ext_gsl
+#cmake3 --build . --config RelWithDebInfo --target ext_tiff
+#cmake3 --build . --config RelWithDebInfo --target ext_jpeg
+#cmake3 --build . --config RelWithDebInfo --target ext_libraw
+#cmake3 --build . --config RelWithDebInfo --target ext_kcrash
+#cmake3 --build . --config RelWithDebInfo --target ext_poppler
+#cmake3 --build . --config RelWithDebInfo --target ext_gsl
 
diff --git a/packaging/linux/appimage/build-krita.sh b/packaging/linux/appimage/build-krita.sh
index 00a79f3913..fbde58da0e 100644
--- a/packaging/linux/appimage/build-krita.sh
+++ b/packaging/linux/appimage/build-krita.sh
@@ -1,87 +1,88 @@
 #!/bin/bash
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
 # ./AppImageKit/build.sh 
 # sudo ./AppImageKit/AppImageAssistant.AppDir/testappimage /isodevice/boot/iso/CentOS-6.5-x86_64-LiveCD.iso bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
 # Now we are inside CentOS 6
 grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
 export LANG=en_us.UTF-8
 
 # Determine which architecture should be built
 if [[ "$(arch)" = "i686" || "$(arch)" = "x86_64" ]] ; then
   ARCH=$(arch)
 else
   echo "Architecture could not be determined"
   exit 1
 fi
 
 # if the library path doesn't point to our usr/lib, linking will be broken and we won't find all deps either
 export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/krita.appdir/usr/lib
 
 git_pull_rebase_helper()
 {
 	git reset --hard HEAD
         git pull
 }
 
 # Use the new compiler
 . /opt/rh/devtoolset-3/enable
 
 
 # Workaround for: On CentOS 6, .pc files in /usr/lib/pkgconfig are not recognized
 # However, this is where .pc files get installed when bulding libraries... (FIXME)
 # I found this by comparing the output of librevenge's "make install" command
 # between Ubuntu and CentOS 6
 ln -sf /usr/share/pkgconfig /usr/lib/pkgconfig
 
 
 # A krita build layout looks like this:
 # krita/ -- the source directory
 # krita/3rdparty -- the cmake3 definitions for the dependencies
 # d -- downloads of the dependencies from files.kde.org
 # b -- build directory for the dependencies
 # krita_build -- build directory for krita itself
 # krita.appdir -- install directory for krita and the dependencies
 
 # Get Krita
 if [ ! -d /krita ] ; then
 	git clone  --depth 1 https://github.com/KDE/krita.git /krita
 fi
 
 cd /krita/
 git_pull_rebase_helper
 
 cd /
 
 # If the environment variable DO_NOT_BUILD_KRITA is set to something,
 # then stop here. This is for docker hub which has a timeout that
 # prevents us from building in one go.
 # if [ ! -z "$DO_NOT_BUILD_KRITA" ] ; then
 #  exit 0
 # fi
 
 mkdir -p /krita_build
 cd /krita_build
 cmake3 ../krita \
     -DCMAKE_INSTALL_PREFIX:PATH=/krita.appdir/usr \
     -DDEFINE_NO_DEPRECATED=1 \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DPACKAGERS_BUILD=1 \
     -DBUILD_TESTING=FALSE \
     -DKDE4_BUILD_TESTS=FALSE \
     -DHAVE_MEMORY_LEAK_TRACKER=FALSE
     
 # build
 make -j4 
 
diff --git a/packaging/linux/appimage/build-release.sh b/packaging/linux/appimage/build-release.sh
index 1bf69d31b6..a8e8b8e159 100644
--- a/packaging/linux/appimage/build-release.sh
+++ b/packaging/linux/appimage/build-release.sh
@@ -1,258 +1,250 @@
 #!/bin/bash
 
-RELEASE=krita-3.0.99.90
+RELEASE=3.1.2.0
 
 # Enter a CentOS 6 chroot (you could use other methods)
 # git clone https://github.com/probonopd/AppImageKit.git
 # ./AppImageKit/build.sh 
 # sudo ./AppImageKit/AppImageAssistant.AppDir/testappimage /isodevice/boot/iso/CentOS-6.5-x86_64-LiveCD.iso bash
 
 # Halt on errors
 set -e
 
 # Be verbose
 set -x
 
 # Now we are inside CentOS 6
 grep -r "CentOS release 6" /etc/redhat-release || exit 1
 
 # If we are running inside Travis CI, then we want to build Krita
 # and we remove the $DO_NOT_BUILD_KRITA environment variable
 # that was used in the process of generating the Docker image.
 # Also we do not want to download and build the dependencies every
 # time we build Krita on travis in the docker image. In order to
 # use newer dependencies, we re-build the docker image instead.
 #unset DO_NOT_BUILD_KRITA
 #NO_DOWNLOAD=1
 
 # clean up
 rm -rf /out/*
 rm -rf /krita.appdir
+rm -rf /krita_build
+mkdir /krita_build
 
 # qjsonparser, used to add metadata to the plugins needs to work in a en_US.UTF-8 environment. That's
 # not always set correctly in CentOS 6.7
 export LC_ALL=en_US.UTF-8
 export LANG=en_us.UTF-8
 
 # Determine which architecture should be built
 if [[ "$(arch)" = "i686" || "$(arch)" = "x86_64" ]] ; then
   ARCH=$(arch)
 else
   echo "Architecture could not be determined"
   exit 1
 fi
 
 # if the library path doesn't point to our usr/lib, linking will be broken and we won't find all deps either
 export LD_LIBRARY_PATH=/usr/lib64/:/usr/lib:/krita.appdir/usr/lib
 
 cd /
 
 # Prepare the install location
 rm -rf /krita.appdir/ || true
 mkdir -p /krita.appdir/usr/bin
 
 # make sure lib and lib64 are the same thing
 mkdir -p /krita.appdir/usr/lib
 cd  /krita.appdir/usr
 ln -s lib lib64
 
 # Use the new compiler
 . /opt/rh/devtoolset-3/enable
 
 # fetch and build krita
 cd /
-wget http://files.kde.org/krita/3/source/$RELEASE.tar.xz
-tar -xf $RELEASE.tar.xz
+#wget http://files.kde.org/krita/krita-$RELEASE.tar.gz
+#wget http://www.valdyas.org/~boud/krita-$RELEASE.tar.gz
+wget http://download.kde.org/unstable/krita/$RELEASE/krita-$RELEASE.tar.gz
+tar -xf krita-$RELEASE.tar.gz
 cd /krita_build
-rm -rf *
-cmake3 ../$RELEASE \
+cmake3 ../krita-$RELEASE \
     -DCMAKE_INSTALL_PREFIX:PATH=/krita.appdir/usr \
     -DDEFINE_NO_DEPRECATED=1 \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+    -DPACKAGERS_BUILD=1 \
     -DBUILD_TESTING=FALSE \
     -DKDE4_BUILD_TESTS=FALSE \
     -DHAVE_MEMORY_LEAK_TRACKER=FALSE
 make -j4 install
 
 cd /krita.appdir
 
 # FIXME: How to find out which subset of plugins is really needed? I used strace when running the binary
 cp -r /usr/plugins ./usr/bin/
 # copy the Qt translation
 cp -r /usr/translations ./usr
 
 cp $(ldconfig -p | grep libsasl2.so.2 | cut -d ">" -f 2 | xargs) ./usr/lib/
 cp $(ldconfig -p | grep libGL.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ # otherwise segfaults!?
 cp $(ldconfig -p | grep libGLU.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ # otherwise segfaults!?
 # Fedora 23 seemed to be missing SOMETHING from the Centos 6.7. The only message was:
 # This application failed to start because it could not find or load the Qt platform plugin "xcb".
 # Setting export QT_DEBUG_PLUGINS=1 revealed the cause.
 # QLibraryPrivate::loadPlugin failed on "/usr/lib64/qt5/plugins/platforms/libqxcb.so" : 
 # "Cannot load library /usr/lib64/qt5/plugins/platforms/libqxcb.so: (/lib64/libEGL.so.1: undefined symbol: drmGetNodeTypeFromFd)"
 # Which means that we have to copy libEGL.so.1 in too
 cp $(ldconfig -p | grep libEGL.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ # Otherwise F23 cannot load the Qt platform plugin "xcb"
 # let's not copy xcb itself, that breaks on dri3 systems https://bugs.kde.org/show_bug.cgi?id=360552
 #cp $(ldconfig -p | grep libxcb.so.1 | cut -d ">" -f 2 | xargs) ./usr/lib/ 
 cp $(ldconfig -p | grep libfreetype.so.6 | cut -d ">" -f 2 | xargs) ./usr/lib/ # For Fedora 20
 
 ldd usr/bin/krita | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
 #ldd usr/lib64/krita/*.so  | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
 #ldd usr/lib64/plugins/imageformats/*.so  | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' ./usr/lib || true
 
 ldd usr/bin/plugins/platforms/libqxcb.so | grep "=>" | awk '{print $3}'  |  xargs -I '{}' cp -v '{}' ./usr/lib || true
 
 # Copy in the indirect dependencies
 FILES=$(find . -type f -executable)
 
 for FILE in $FILES ; do
 	ldd "${FILE}" | grep "=>" | awk '{print $3}' | xargs -I '{}' cp -v '{}' usr/lib || true
 done
 
 #DEPS=""
 #for FILE in $FILES ; do
 #  ldd "${FILE}" | grep "=>" | awk '{print $3}' | xargs -I '{}' echo '{}' > DEPSFILE
 #done
 #DEPS=$(cat DEPSFILE  |sort | uniq)
 #for FILE in $DEPS ; do
 #  if [ -f $FILE ] ; then
 #    echo $FILE
 #    cp --parents -rfL $FILE ./
 #  fi
 #done
 #rm -f DEPSFILE
 
 
 # The following are assumed to be part of the base system
 rm -f usr/lib/libcom_err.so.2 || true
 rm -f usr/lib/libcrypt.so.1 || true
 rm -f usr/lib/libdl.so.2 || true
 rm -f usr/lib/libexpat.so.1 || true
 #rm -f usr/lib/libfontconfig.so.1 || true
 rm -f usr/lib/libgcc_s.so.1 || true
 rm -f usr/lib/libglib-2.0.so.0 || true
 rm -f usr/lib/libgpg-error.so.0 || true
 rm -f usr/lib/libgssapi_krb5.so.2 || true
 rm -f usr/lib/libgssapi.so.3 || true
 rm -f usr/lib/libhcrypto.so.4 || true
 rm -f usr/lib/libheimbase.so.1 || true
 rm -f usr/lib/libheimntlm.so.0 || true
 rm -f usr/lib/libhx509.so.5 || true
 rm -f usr/lib/libICE.so.6 || true
 rm -f usr/lib/libidn.so.11 || true
 rm -f usr/lib/libk5crypto.so.3 || true
 rm -f usr/lib/libkeyutils.so.1 || true
 rm -f usr/lib/libkrb5.so.26 || true
 rm -f usr/lib/libkrb5.so.3 || true
 rm -f usr/lib/libkrb5support.so.0 || true
 # rm -f usr/lib/liblber-2.4.so.2 || true # needed for debian wheezy
 # rm -f usr/lib/libldap_r-2.4.so.2 || true # needed for debian wheezy
 rm -f usr/lib/libm.so.6 || true
 rm -f usr/lib/libp11-kit.so.0 || true
 rm -f usr/lib/libpcre.so.3 || true
 rm -f usr/lib/libpthread.so.0 || true
 rm -f usr/lib/libresolv.so.2 || true
 rm -f usr/lib/libroken.so.18 || true
 rm -f usr/lib/librt.so.1 || true
 rm -f usr/lib/libsasl2.so.2 || true
 rm -f usr/lib/libSM.so.6 || true
 rm -f usr/lib/libusb-1.0.so.0 || true
 rm -f usr/lib/libuuid.so.1 || true
 rm -f usr/lib/libwind.so.0 || true
 rm -f usr/lib/libfontconfig.so.* || true
 
 # Remove these libraries, we need to use the system versions; this means 11.04 is not supported (12.04 is our baseline)
 rm -f usr/lib/libGL.so.* || true
 rm -f usr/lib/libdrm.so.* || true
 rm -f usr/lib/libX11.so.* || true
 #rm -f usr/lib/libz.so.1 || true
 
 # These seem to be available on most systems but not Ubuntu 11.04
 # rm -f usr/lib/libffi.so.6 usr/lib/libGL.so.1 usr/lib/libglapi.so.0 usr/lib/libxcb.so.1 usr/lib/libxcb-glx.so.0 || true
 
 # Delete potentially dangerous libraries
 rm -f usr/lib/libstdc* usr/lib/libgobject* usr/lib/libc.so.* || true
 rm -f usr/lib/libxcb.so.1
 
 # Do NOT delete libX* because otherwise on Ubuntu 11.04:
 # loaded library "Xcursor" malloc.c:3096: sYSMALLOc: Assertion (...) Aborted
 
 # We don't bundle the developer stuff
 rm -rf usr/include || true
 rm -rf usr/lib/cmake3 || true
 rm -rf usr/lib/pkgconfig || true
 rm -rf usr/share/ECM/ || true
 rm -rf usr/share/gettext || true
 rm -rf usr/share/pkgconfig || true
 
+mv usr/share/locale usr/share/krita || true
+
 strip usr/lib/kritaplugins/* usr/bin/* usr/lib/* || true
 
 # Since we set /krita.appdir as the prefix, we need to patch it away too (FIXME)
 # Probably it would be better to use /app as a prefix because it has the same length for all apps
 cd usr/ ; find . -type f -exec sed -i -e 's|/krita.appdir/usr/|./././././././././|g' {} \; ; cd  ..
 
 # On openSUSE Qt is picking up the wrong libqxcb.so
 # (the one from the system when in fact it should use the bundled one) - is this a Qt bug?
 # Also, Krita has a hardcoded /usr which we patch away
 cd usr/ ; find . -type f -exec sed -i -e 's|/usr|././|g' {} \; ; cd ..
 
 # We do not bundle this, so let's not search that inside the AppImage. 
 # Fixes "Qt: Failed to create XKB context!" and lets us enter text
 sed -i -e 's|././/share/X11/|/usr/share/X11/|g' ./usr/bin/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.so
 sed -i -e 's|././/share/X11/|/usr/share/X11/|g' ./usr/lib/libQt5XcbQpa.so.5
 
 # Workaround for:
 # D-Bus library appears to be incorrectly set up;
 # failed to read machine uuid: Failed to open
 # The file is more commonly in /etc/machine-id
 # sed -i -e 's|/var/lib/dbus/machine-id|//././././etc/machine-id|g' ./usr/lib/libdbus-1.so.3
 # or
 rm -f ./usr/lib/libdbus-1.so.3 || true
 
 cp ../AppImageKit/AppRun .
 cp ./usr/share/applications/org.kde.krita.desktop krita.desktop
 cp /krita/krita/pics/app/64-apps-calligrakrita.png calligrakrita.png
 
 # replace krita with the lib-checking startup script.
 #cd /krita.appdir/usr/bin
 #mv krita krita.real
 #wget https://raw.githubusercontent.com/boudewijnrempt/AppImages/master/recipes/krita/krita
 #chmod a+rx krita
 cd / 
 
 APP=krita
 
-# Source functions
-wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./functions.sh
-. ./functions.sh
-
-# Install desktopintegration in usr/bin/krita.wrapper -- feel free to edit it
-cd /krita.appdir
-get_desktopintegration krita
-
 cd /
 
 VER=$(grep "#define KRITA_VERSION_STRING" krita_build/libs/version/kritaversion.h | cut -d '"' -f 2)
 VERSION=$VER
 VERSION="$(sed s/\ /-/g <<<$VERSION)"
 echo $VERSION
 
 if [[ "$ARCH" = "x86_64" ]] ; then
 	APPIMAGE=$APP"-"$VERSION"-x86_64.appimage"
 fi
 if [[ "$ARCH" = "i686" ]] ; then
 	APPIMAGE=$APP"-"$VERSION"-i386.appimage"
 fi
 echo $APPIMAGE
 
 mkdir -p /out
 
 rm -f /out/*.AppImage || true
 AppImageKit/AppImageAssistant.AppDir/package /krita.appdir/ /out/$APPIMAGE
 
 chmod a+rwx /out/$APPIMAGE # So that we can edit the AppImage outside of the Docker container
-
-cd /krita.appdir
-mv AppRun krita
-cd /
-mv krita.appdir $APP"-"$VERSION"-x86_64
-tar -czf $APP"-"$VERSION"-x86_64.tgz $APP"-"$VERSION"-x86_64