diff --git a/Building/Linux/mkDistDeb.sh b/Building/Linux/mkDistDeb.sh
index 9b1716d6..3ae97f5b 100755
--- a/Building/Linux/mkDistDeb.sh
+++ b/Building/Linux/mkDistDeb.sh
@@ -1,5 +1,6 @@
 #! /bin/bash
-# First parameter is optional
+# First parameter names distribution and release number
+# eg Debian10 Ubuntu18 RasPiOS
 #
 function getPkg () {
     unset PKGNAME
diff --git a/Building/Linux/mkOSDistDeb.sh b/Building/Linux/mkOSDistDeb.sh
new file mode 100755
index 00000000..d90eca48
--- /dev/null
+++ b/Building/Linux/mkOSDistDeb.sh
@@ -0,0 +1,212 @@
+#! /bin/bash
+# No parameter is not required
+# This script will identify the distribution and release version
+#
+
+function getOS () {
+  rel=$(lsb_release -r | awk '{print $2}')
+  os=$(lsb_release -i | awk '{print $3}')
+  tmp2=${os:0:3}
+  echo "tmp2 = '$tmp2'"
+  if [ "$tmp2" = "Ubu" ] ; then
+    OSNAME=$os${rel:0:2}
+  elif [ "$tmp2" = "Deb" ];then
+    OSNAME=$os$rel
+  elif [ "$tmp2" = "Ras" ];then
+    OSNAME="RasPiOS"
+  else
+    OSNAME="unknown"
+  fi
+}
+
+function getPkg () {
+    unset PKGNAME
+    unset PKGVERS
+    while read stat pkg ver other ;
+        do 
+            if [[ ${stat} == "ii" ]] ; then
+                PKGNAME=`awk -F: '{print $1}' <<< ${pkg}`
+                PKGVERS=`awk -F. '{print $1 "." $2}' <<< ${ver}`
+                break
+            fi ;
+        done <<< $(dpkg -l | grep $1)
+}
+
+ITERATION=$1
+if [  -z ${ITERATION} ]; then
+    ITERATION="1"
+fi
+
+SRC=/home/$USER/OSCAR/OSCAR-code/oscar
+
+VERSION=`awk '/#define VERSION / { gsub(/"/, "", $3); print $3 }' ${SRC}/VERSION`
+if [[ ${VERSION} == *-* ]]; then
+    # Use ~ for prerelease information so that it sorts correctly compared to release
+    # versions. See https://www.debian.org/doc/debian-policy/ch-controlfields.html#version
+    IFS="-" read -r VERSION PRERELEASE <<< ${VERSION}
+    if [[ ${PRERELEASE} == *rc* ]]; then
+        RC=1
+    fi
+    VERSION="${VERSION}~${PRERELEASE}"
+fi
+GIT_REVISION=`awk '/#define GIT_REVISION / { gsub(/"/, "", $3); print $3 }' ${SRC}/git_info.h`
+echo Version: ${VERSION}
+
+# application name
+appli_name="OSCAR"
+package_name="oscar"
+pre_inst="tst_user.sh"
+# build folder (absolute path is better)
+build_folder="/home/$USER/OSCAR/build"
+if [[ -n ${PRERELEASE}  && -z ${RC} ]] ; then
+    appli_name=${appli_name}-test
+    package_name=${package_name}-test
+    post_inst="ln_usrbin-test.sh"
+    pre_rem="rm_usrbin-test.sh"
+    post_rem="clean_rm-test.sh"
+else
+    post_inst="ln_usrbin.sh"
+    pre_rem="rm_usrbin.sh"
+    post_rem="clean_rm.sh"
+fi
+
+# temporary folder (absolute path is better)
+temp_folder="/home/$USER/tmp_deb_${appli_name}/"
+
+# destination folder in the .deb file
+dest_folder="/usr/"
+
+# the .deb file mustn't exist
+archi_tmp=$(lscpu | grep -i architecture | awk -F: {'print $2'} | tr -d " ")
+if [ "$archi_tmp" = "x86_64" ];then
+    archi="amd64"
+else
+    archi="unknown"
+fi
+
+# detection of the OS with version for Ubuntu
+getOS
+echo "osname='$OSNAME'"
+
+#deb_file="${appli_name}_${VERSION}-${ITERATION}_$archi.deb"
+deb_file="${appli_name}_${VERSION}-${OSNAME}_$archi.deb"
+
+# if deb file exists, fatal error
+if [ -f "./$deb_file" ]; then
+    echo "destination file (./$deb_file) exists. fatal error"
+    exit
+fi
+
+# retrieve packages version for the dependencies
+getPkg libqt5core
+qtver=$PKGVERS
+
+getPkg libdouble
+dblPkg=$PKGNAME
+
+echo "QT version " $qtver
+echo "DblConv package " $dblPkg
+
+# clean folders need to create the package
+if [ -d "${temp_folder}" ]; then
+    rm -r ${temp_folder}
+fi
+mkdir ${temp_folder}
+if [ ! -d "${temp_folder}" ]; then
+    echo "Folder (${temp_folder}) not created : fatal error."
+    exit
+fi
+chmod 0755 ${temp_folder}
+# save current value of umask (for u=g and not g=o)
+current_value=$(umask)
+umask 022
+mkdir ${temp_folder}/bin
+mkdir ${temp_folder}/share
+mkdir ${temp_folder}/share/${appli_name}
+mkdir ${temp_folder}/share/doc
+share_doc_folder="${temp_folder}/share/doc/${package_name}"
+mkdir ${share_doc_folder}
+mkdir ${temp_folder}/share/icons
+mkdir ${temp_folder}/share/icons/hicolor
+mkdir ${temp_folder}/share/icons/hicolor/48x48
+mkdir ${temp_folder}/share/icons/hicolor/48x48/apps
+mkdir ${temp_folder}/share/icons/hicolor/scalable
+mkdir ${temp_folder}/share/icons/hicolor/scalable/apps
+mkdir ${temp_folder}/share/applications
+
+# must delete debug symbol in OSCAR binary file
+# --- V1
+strip -s -o ${temp_folder}/bin/${appli_name} ${build_folder}/oscar/OSCAR
+#old code : cp ${build_folder}/oscar/OSCAR ${temp_folder}/bin
+
+# 2>/dev/null : errors does not appear : we don't care about them
+cp -r ${build_folder}/oscar/Help ${temp_folder}/share/${appli_name} 2>/dev/null
+cp -r ${build_folder}/oscar/Html ${temp_folder}/share/${appli_name} 2>/dev/null
+cp -r ${build_folder}/oscar/Translations ${temp_folder}/share/${appli_name} 2>/dev/null
+cp ./${appli_name}.png ${temp_folder}/share/icons/hicolor/48x48/apps/${appli_name}.png
+cp ./${appli_name}.svg ${temp_folder}/share/icons/hicolor/scalable/apps/${appli_name}.svg
+cp ./${appli_name}.desktop ${temp_folder}/share/applications/${appli_name}.desktop
+
+#echo "Copyright 2019-2020 oscar-team.org <oscar@oscar-team.org>" > $share_doc_folder/copyright
+#echo "Licensed under /usr/share/common-licenses/GPL-3" >> $share_doc_folder/copyright
+cp ./copyright $share_doc_folder/copyright
+
+changelog_file="./changelog"
+
+#automatic changelog as a bad name
+# need to generate one and say fpm to use it instead of create one
+# it seems that it needs both of them...
+
+# creation of the Debian changelog
+echo "$appli_name (${VERSION}-${ITERATION}) whatever; urgency=medium" > $changelog_file
+echo "" >> $changelog_file
+echo "  * Package created with FPM." >> $changelog_file
+echo "" >> $changelog_file
+echo "  * See the Release Notes under Help/About menu" >> $changelog_file
+echo "" >> $changelog_file
+echo -n " -- oscar-team.org <oscar@oscar-team.org> " >> $changelog_file
+date -Iminutes >> $changelog_file
+cp $changelog_file $share_doc_folder/changelog
+gzip --best $share_doc_folder/changelog
+
+description='Open Source CPAP Analysis Reporter\nProvides graphical and statistical display of the CPAP stored data'
+# trick for dummies : need to use echo -e to take care of \n (cariage return to slip description and extra one
+description=$(echo -e $description)
+
+# restore umask value
+umask $current_value
+
+# create the .deb file (litian test show juste a warning with a man that doesn't exists : don't care about that)
+fpm --input-type dir --output-type deb  \
+    --prefix ${dest_folder} \
+    --before-install ${pre_inst} \
+    --after-install ${post_inst}   \
+    --before-remove ${pre_rem}   \
+    --after-remove ${post_rem} \
+    --name ${appli_name} --version ${VERSION} --iteration ${OSNAME} \
+    --category misc               \
+    --deb-priority optional \
+    --maintainer " -- oscar-team.org <oscar@oscar-team.org>"   \
+    --license GPL3+             \
+    --vendor oscar-team.org    \
+    --description "$description" \
+    --url https://sleepfiles.com/OSCAR  \
+    --deb-no-default-config-files   \
+    --depends $dblPkg \
+    --depends libpcre16-3 \
+    --depends qttranslations5-l10n \
+    --depends "libqt5core5a >= 5.9"   \
+    --depends libqt5serialport5     \
+    --depends libqt5xml5            \
+    --depends libqt5network5        \
+    --depends libqt5gui5            \
+    --depends libqt5widgets5        \
+    --depends libqt5opengl5         \
+    --depends libqt5printsupport5   \
+    --depends libglu1-mesa          \
+    --depends libgl1                \
+    --depends libc6                 \
+    --no-deb-generate-changes \
+    -C ${temp_folder} \
+    .
+
diff --git a/oscar/VERSION b/oscar/VERSION
index e8c51c98..8c9f212c 100644
--- a/oscar/VERSION
+++ b/oscar/VERSION
@@ -1,4 +1,4 @@
 // Update the string below to set OSCAR's version and release status.
 // See https://semver.org/spec/v2.0.0.html for details on format.
 
-#define VERSION "1.3.0-beta.1"
+#define VERSION "1.3.0-beta.2"
diff --git a/oscar/mainwindow.cpp b/oscar/mainwindow.cpp
index 3739d245..b0e08b24 100644
--- a/oscar/mainwindow.cpp
+++ b/oscar/mainwindow.cpp
@@ -999,7 +999,7 @@ void MainWindow::on_action_Import_Data_triggered()
 }
 
 
-QList<ImportPath> MainWindow::selectCPAPDataCards(const QString & prompt)
+QList<ImportPath> MainWindow::selectCPAPDataCards(const QString & prompt, bool alwaysPrompt)
 {
     QList<ImportPath> datacards = detectCPAPCards();
 
@@ -1028,7 +1028,7 @@ QList<ImportPath> MainWindow::selectCPAPDataCards(const QString & prompt)
             infostr = tr("A %1 file structure was located at:").arg(datacards[0].loader->loaderName());
         }
 
-        if (!p_profile->cpap->autoImport()) {
+        if (alwaysPrompt || !p_profile->cpap->autoImport()) {
             QMessageBox mbox(QMessageBox::NoIcon,
                 tr("CPAP Data Located"), infostr+"\n\n"+QDir::toNativeSeparators(datacards[0].path)+"\n\n"+
                 prompt,
@@ -2661,7 +2661,7 @@ void MainWindow::on_mainsplitter_splitterMoved(int, int)
 
 void MainWindow::on_actionCreate_Card_zip_triggered()
 {
-    QList<ImportPath> datacards = selectCPAPDataCards(tr("Would you like to zip this card?"));
+    QList<ImportPath> datacards = selectCPAPDataCards(tr("Would you like to zip this card?"), true);
 
     for (auto & datacard : datacards) {
         QString cardPath = QDir(datacard.path).canonicalPath();
diff --git a/oscar/mainwindow.h b/oscar/mainwindow.h
index ee48c7ec..e50d21c1 100644
--- a/oscar/mainwindow.h
+++ b/oscar/mainwindow.h
@@ -374,7 +374,7 @@ private:
     QString getMainWindowTitle();
     void importCPAPBackups();
     QList<ImportPath> detectCPAPCards();
-    QList<ImportPath> selectCPAPDataCards(const QString & prompt);
+    QList<ImportPath> selectCPAPDataCards(const QString & prompt, bool alwaysPrompt = false);
     void importCPAPDataCards(const QList<ImportPath> & datacards);
     void addMachineToMenu(Machine* mach, QMenu* menu);
     void purgeDay(MachineType type);