diff --git a/configure b/configure
index 439f5d69ea6..2cbd9363f7b 100755
--- a/configure
+++ b/configure
@@ -777,6 +777,10 @@ MSGFMT
 USE_NLS
 MKINSTALLDIRS
 SET_MAKE
+OBS_SRCMD5
+OBS_ARCH
+OBS_DISTRIBUTION
+OBS_PROJECT
 HAVE_DARWIN_OS_FALSE
 HAVE_DARWIN_OS_TRUE
 HAVE_IRIX_OS_FALSE
@@ -17321,6 +17325,31 @@ fi
 $as_echo "done" >&6; }
 
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OBS OS Distribution" >&5
+$as_echo_n "checking for OBS OS Distribution... " >&6; }
+if test "x$OBS_DISTRIBUTION" != "x"
+then
+   echo "obsdistname set to $OBS_DISTRIBUTION"
+else
+   if test -e /.build.log; then
+      OBS_PROJECT=`grep 'Building bareos for project' /.build.log | cut -d' ' -f10 | sed "s#'##g"`
+      OBS_DISTRIBUTION=`grep 'Building bareos for project' /.build.log | cut -d' ' -f12 | sed "s#'##g"`
+      OBS_ARCH=`grep 'Building bareos for project' /.build.log | cut -d' ' -f14 | sed "s#'##g"`
+      OBS_SRCMD5=`grep 'Building bareos for project' /.build.log | cut -d' ' -f16 | sed "s#'##g"`
+
+$as_echo "#define IS_BUILD_ON_OBS 1" >>confdefs.h
+
+   fi
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5
+$as_echo "done" >&6; }
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
@@ -23653,9 +23682,46 @@ fi
       fi
 
       if test "$have_gnutls" = "yes"; then
+         # do an additional check to see if required functions are available,
+         # otherwise disable gnutls
+         for ac_func in gnutls_cipher_init
+do :
+  ac_fn_c_check_func "$LINENO" "gnutls_cipher_init" "ac_cv_func_gnutls_cipher_init"
+if test "x$ac_cv_func_gnutls_cipher_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_CIPHER_INIT 1
+_ACEOF
+
+	        have_gnutls="yes"
+
+else
+
+	        have_gnutls="no"
+
+
+fi
+done
+
+      fi
+
+      if test "$have_gnutls" = "yes"; then
 
 $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
 
+         # gnutls_transport_set_ptr may cause problems on some platforms,
+         # therefore the replacement gnutls_transport_set_int is used
+         # when available (since GnuTLS >= 3.1.9)
+         for ac_func in gnutls_transport_set_int
+do :
+  ac_fn_c_check_func "$LINENO" "gnutls_transport_set_int" "ac_cv_func_gnutls_transport_set_int"
+if test "x$ac_cv_func_gnutls_transport_set_int" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_GNUTLS_TRANSPORT_SET_INT 1
+_ACEOF
+
+fi
+done
+
       fi
 
       if test "$support_tls" != "no" -a "$have_gnutls" = "yes"; then