diff --git a/core/dplugins/dimg/jpeg2000/dimgjpeg2000loader.h b/core/dplugins/dimg/jpeg2000/dimgjpeg2000loader.h
index 93c6abc69e..39f1fab421 100644
--- a/core/dplugins/dimg/jpeg2000/dimgjpeg2000loader.h
+++ b/core/dplugins/dimg/jpeg2000/dimgjpeg2000loader.h
@@ -1,66 +1,67 @@
 /* ============================================================
  *
  * This file is a part of digiKam project
  * https://www.digikam.org
  *
  * Date        : 2006-06-14
  * Description : A JPEG-2000 IO file for DImg framework
  *
  * Copyright (C) 2006-2019 by Gilles Caulier <caulier dot gilles at gmail dot com>
  *
  * Others Linux JPEG-2000 Loader implementation:
  *    https://github.com/ImageMagick/ImageMagick/blob/master/coders/jp2.c
  *    https://github.com/GNOME/gimp/blob/master/plug-ins/common/file-jp2-load.c
  *    https://invent.kde.org/kde/krita/tree/fc1d4dce1c12a1a663d02436cde15a77e067af2c/plugins/impex/jp2
+ *    https://github.com/darktable-org/darktable/blob/master/src/imageio/format/j2k.c
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
  * Public License as published by the Free Software Foundation;
  * either version 2, or (at your option)
  * any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * ============================================================ */
 
 #ifndef DIGIKAM_DIMG_JPEG_2000_LOADER_H
 #define DIGIKAM_DIMG_JPEG_2000_LOADER_H
 
 // Local includes
 
 #include "dimg.h"
 #include "dimgloader.h"
 #include "digikam_export.h"
 
 using namespace Digikam;
 
 namespace DigikamJPEG2000DImgPlugin
 {
 
 class DIGIKAM_EXPORT DImgJPEG2000Loader : public DImgLoader
 {
 
 public:
 
     explicit DImgJPEG2000Loader(DImg* const image);
     ~DImgJPEG2000Loader();
 
     bool load(const QString& filePath, DImgLoaderObserver* const observer) override;
     bool save(const QString& filePath, DImgLoaderObserver* const observer) override;
 
     bool hasAlpha()   const override;
     bool sixteenBit() const override;
     bool isReadOnly() const override;
 
 private:
 
     bool m_sixteenBit;
     bool m_hasAlpha;
 };
 
 } // namespace DigikamJPEG2000DImgPlugin
 
 #endif // DIGIKAM_DIMG_JPEG_2000_LOADER_H
diff --git a/project/bundles/mxe/config.sh b/project/bundles/mxe/config.sh
index 4541a71079..2193e72914 100644
--- a/project/bundles/mxe/config.sh
+++ b/project/bundles/mxe/config.sh
@@ -1,77 +1,77 @@
 #!/bin/bash
 
 # Copyright (c) 2013-2019, Gilles Caulier, <caulier dot gilles at gmail dot com>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
 ########################################################################
 
 # Absolute path where are downloaded all tarballs to compile.
 DOWNLOAD_DIR="`pwd`/temp.dwnld"
 
 # Absolute path where are compiled all tarballs
 BUILDING_DIR="`pwd`/temp.build"
 
 #-------------------------------------------------------------------------------------------
 
 # MXE configuration
 
 #------------
 # IMPORTANT: Target Windows architecture to build installer. Possible values: 32 or 64 bits.
-MXE_ARCHBITS=32
+MXE_ARCHBITS=64
 #------------
 
 if [[ $MXE_ARCHBITS == 32 ]]; then
     # Windows 32 bits shared
     MXE_BUILD_TARGETS="i686-w64-mingw32.shared"
     MXE_BUILDROOT="`pwd`/build.win32"
 elif [[ $MXE_ARCHBITS == 64 ]]; then
     # Windows 64 bits shared
     MXE_BUILD_TARGETS="x86_64-w64-mingw32.shared"
     MXE_BUILDROOT="`pwd`/build.win64"
 else
     echo "Unsupported or wrong target Windows architecture: $MXE_ARCHBITS bits."
     exit -1
 fi
 
 echo "Target Windows architecture: $MXE_ARCHBITS bits."
 
 MXE_GIT_URL="https://github.com/mxe/mxe.git"
 MXE_GIT_REVISION=master
 MXE_INSTALL_PREFIX=${MXE_BUILDROOT}/usr/${MXE_BUILD_TARGETS}/
 MXE_TOOLCHAIN=${MXE_INSTALL_PREFIX}/share/cmake/mxe-conf.cmake
 
 #-------------------------------------------------------------------------------------------
 
 # URL to git repository to checkout digiKam source code
 DK_GITURL="git@invent.kde.org:kde/digikam.git"
 
 # digiKam tarball information.
 DK_URL="http://download.kde.org/stable/digikam"
 
 # Location to build source code.
 DK_BUILDTEMP=~/dktemp
 
 # digiKam tag version from git. Official tarball do not include extra shared libraries.
 # The list of tags can be listed with this url: https://quickgit.kde.org/?p=digikam.git&a=tags
 # If you want to package current implemntation from git, use "master" as tag.
 #DK_VERSION=v6.2.0
 DK_VERSION=master
 #DK_VERSION=development/dplugins
 
 # Installer sub version to differentiates newer updates of the installer itself, even if the underlying application hasn’t changed.
 #DK_EPOCH="-01"
 # Epoch with time-stamp for pre-release bundle in ISO format
 DK_EPOCH="-`date "+%Y%m%dT%H%M%S"`"
 
 # Installer will include or not digiKam debug symbols
 DK_DEBUG=1
 
 # Sign bundles with GPG. Passphrase must be hosted in ~/.gnupg/dkorg-gpg-pwd.txt
 DK_SIGN=0
 
 # Upload automatically bundle to files.kde.org (pre-release only).
 DK_UPLOAD=1
 DK_UPLOADURL="digikam@milonia.kde.org"
 DK_UPLOADDIR="/srv/archives/files/digikam/"