diff --git a/PKG-INFO b/PKG-INFO
index 65a2b763b4374838e5fffc6b1432fc3df71492c6..a92748ab9090ae61cd007a60ffa4b4408bf37d7d 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: pidp.tools
-Version: 1.3.3
+Version: 1.3.4
 Summary: PETRA III Debian Package Tools
 Home-page: https://stash.desy.de/projects/JMK/repos/pidptools/browse/
 Author: Jan Kotanski
diff --git a/pidpbuild b/pidpbuild
index 7b42c1e3427d38b9dfdd2c80c8cb2b9ce8eed60c..0796ab740cc12cad13c51ee5814ee7b5740a1df3 100755
--- a/pidpbuild
+++ b/pidpbuild
@@ -66,7 +66,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then
     echo "Error: PACKAGE variable is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] ; then
-    echo "pidpbuild version 1.3.3"
+    echo "pidpbuild version 1.3.4"
     echo ""
     echo "usage: pidpbuild [<TARBALL>] [-v=<VERSION>] [-ns|--no-signature]"
     echo "                 [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]"
@@ -186,10 +186,18 @@ else
 	    fi
 	    git clean -f -d
 	    if [[ -f $TARBALL ]] ; then
-		if [[ -z $MERGE ]] ; then
-		    gbp import-orig "$TARBALL" --merge-mode=replace
-		else
+		GBPV=$(gbp --version)
+		IFS=' ' read -r GBPNAME GBPVERSION <<< $GBPV
+		IFS='.' read -r VMAJ VMIN  VPATCH <<< $GBPVERSION
+		
+		if [[ "$VMAJ" -eq "0" ]] && [[ "$VMIN" -lt "8" ]] ; then
 		    gbp import-orig "$TARBALL"
+		else
+		    if [[ -z $MERGE ]] ; then
+			gbp import-orig "$TARBALL" --merge-mode=replace
+		    else
+			gbp import-orig "$TARBALL" --merge-mode=merge
+		    fi
 		fi
 	    else
 		echo "Error: $TARBALL cannot be found" ; exit 1
diff --git a/pidpclone b/pidpclone
index b440e2be2f628506a86fdef3b3eaf3db9ecdc295..8661c06ceb345285e47169282663ca549708dbfa 100755
--- a/pidpclone
+++ b/pidpclone
@@ -59,7 +59,7 @@ if [[ ! -z $HELP ]] && [[ -z $PACKAGE ]] ; then
     echo "Error: PACKAGE variable is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $PACKAGE  ]] ; then
-    echo "pidpclone version 1.3.3"
+    echo "pidpclone version 1.3.4"
     echo ""
     echo "usage: pidpclone <DEB-PACKAGE-NAME> [-p|--patch] [-u=<USER>] [-h|--help]"
     echo "                  [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv] "
diff --git a/pidpcreate b/pidpcreate
index 2bb015d4747caec460a3268b65cd2607e8c221fd..6c65b15ce3b2206cd1c983914e66daef311e4a5c 100755
--- a/pidpcreate
+++ b/pidpcreate
@@ -70,7 +70,7 @@ if [[ ! -z $HELP ]] && [[ -z $TARBALL ]] ; then
     echo "Error: TARBALL variable is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $PACKAGE ]] || [[ -z $TARBALL ]] ; then
-    echo "pidpbuild version 1.3.3"
+    echo "pidpbuild version 1.3.4"
     echo ""
     echo "usage: pidpcreate <DEB-PACKAGE-NAME> <TARBALL> [-v=<SRCVERSION>] [-ns|--no-signature]"
     echo "                 [-e=<DEBEMAIL>] [-f=<DEBFULLNAME>] [-ne|--nodebenv]"
diff --git a/pidppush b/pidppush
index 6bbaf5aaec24f77bb5e9bd02cf70f23f06ee86ac..17f167cc12d17c2a77f8bbef67f6ea9dbdafcf28 100755
--- a/pidppush
+++ b/pidppush
@@ -45,7 +45,7 @@ if [[ ! -z $HELP ]] && [[ -z $DEBPACKAGE ]] ; then
     echo "Error: DEB-PACKAGE-NAME argument is not defined"
 fi
 if [[ ! -z $HELP ]] || [[ -z $DEBPACKAGE  ]] ; then
-    echo "pidppush version 1.3.3"
+    echo "pidppush version 1.3.4"
     echo ""
     echo "usage: pidppush <DEB-PACKAGE-NAME> "
     echo ""
diff --git a/setup.py b/setup.py
index f57ab74d11d30601bf7ff718446e4ade5fce9934..0432ed2bf6e0ce4e75d8d2f35a13f00bedbfb615 100755
--- a/setup.py
+++ b/setup.py
@@ -30,7 +30,7 @@ def read(fname):
     return open(os.path.join(os.path.dirname(__file__), fname)).read()
 
 #: (:obj:`str`) full release number
-release = '1.3.3'
+release = '1.3.4'
 
 #: (:obj:`dict` <:obj:`str` , any >`) metadata for distutils
 SETUPDATA = dict(