diff --git a/configure b/configure
index b9320dacb8e..ba4bb17c1e0 100755
--- a/configure
+++ b/configure
@@ -963,7 +963,14 @@ PACKAGE_TARNAME
 PACKAGE_NAME
 PATH_SEPARATOR
 SHELL'
-ac_subst_files='MCOMMON'
+ac_subst_files='DEBIAN_CONTROL_BAT
+DEBIAN_CONTROL_TRAYMONITOR
+DEBIAN_CONTROL_UNIVENTION_BAREOS
+DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA
+MCOMMON
+DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN
+DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN
+DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN'
 ac_user_opts='
 enable_option_checking
 enable_libtool
@@ -21990,11 +21997,13 @@ fi
 
 
 BAT_DIR=
+DEBIAN_CONTROL_BAT=/dev/null
 if test x$support_bat = xyes; then
    abc=`$PKGCONFIG --atleast-version=4.6 QtGui`
    pkg=$?
    if test $pkg = 0; then
       BAT_DIR=src/qt-console
+      DEBIAN_CONTROL_BAT=./debian/control.bareos-bat
    else
       as_fn_error $? "Unable to find suitable Qt4 installation needed by bat" "$LINENO" 5
    fi
@@ -22002,6 +22011,7 @@ fi
 
 
 
+
 # Check whether --enable-traymonitor was given.
 if test "${enable_traymonitor+set}" = set; then :
   enableval=$enable_traymonitor;
@@ -22017,11 +22027,13 @@ fi
 
 
 TRAY_MONITOR_DIR=
+DEBIAN_CONTROL_TRAYMONITOR=/dev/null
 if test x$support_traymonitor = xyes; then
    abc=`$PKGCONFIG --atleast-version=4.6 QtGui`
    pkg=$?
    if test $pkg = 0; then
       TRAY_MONITOR_DIR=src/qt-tray-monitor
+      DEBIAN_CONTROL_TRAYMONITOR=./debian/control.bareos-traymonitor
    else
       as_fn_error $? "Unable to find suitable Qt4 installation needed by tray-monitor" "$LINENO" 5
    fi
@@ -22030,6 +22042,7 @@ fi
 
 
 
+
 # Check whether --enable-smartalloc was given.
 if test "${enable_smartalloc+set}" = set; then :
   enableval=$enable_smartalloc;
@@ -32049,6 +32062,8 @@ osx)
 debian|ubuntu|univention)
    TAPEDRIVE="/dev/nst0"
    PSCMD="ps -e -o pid,command"
+   DEBIAN_CONTROL_UNIVENTION_BAREOS=/dev/null
+   DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA=/dev/null
    PFILES="${PFILES} \
       debian/bareos-bat.install \
       debian/bareos-bconsole.install \
@@ -32078,6 +32093,7 @@ debian|ubuntu|univention)
       debian/bareos-storage.preinst \
       debian/bareos-tools.install \
       debian/bareos-traymonitor.install \
+      debian/control \
       platforms/debian/Makefile \
       platforms/debian/set_dbconfig_vars.sh"
    case "$DISTNAME" in
@@ -32086,12 +32102,16 @@ debian|ubuntu|univention)
             platforms/ubuntu/Makefile"
          ;;
       univention)
+         DEBIAN_CONTROL_UNIVENTION_BAREOS=./debian/control.univention-bareos
+         DEBIAN_CONTROL_UNIVENTION_BAREOS_SCHEMA=./debian/control.univention-bareos-schema
          PFILES="${PFILES} \
             debian/univention-bareos-schema.install \
             debian/univention-bareos.install \
             platforms/univention/Makefile"
          ;;
    esac
+
+
   ;;
 freebsd)
    VER=`echo $DISTVER | cut -c 1`
@@ -32328,11 +32348,17 @@ MCOMMON=./autoconf/Make.common
 BUILD_FD_PLUGINS=""
 BUILD_SD_PLUGINS=""
 BUILD_DIR_PLUGINS=""
+DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=/dev/null
+DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=/dev/null
+DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=/dev/null
 
 if test X"$support_python" = "Xyes" ; then
    BUILD_FD_PLUGINS="${BUILD_FD_PLUGINS} python-fd.la"
    BUILD_SD_PLUGINS="${BUILD_SD_PLUGINS} python-sd.la"
    BUILD_DIR_PLUGINS="${BUILD_DIR_PLUGINS} python-dir.la"
+   DEBIAN_CONTROL_FILEDAEMON_PYTHON_PLUGIN=./debian/control.bareos-filedaemon-python-plugin
+   DEBIAN_CONTROL_STORAGE_PYTHON_PLUGIN=./debian/control.bareos-storage-python-plugin
+   DEBIAN_CONTROL_DIRECTOR_PYTHON_PLUGIN=./debian/control.bareos-director-python-plugin
 fi
 
 if test X"$have_scsi_crypto" = "Xyes" ; then
@@ -32349,6 +32375,9 @@ fi
 
 
 
+
+
+
 if test x$use_libtool != xno; then
    BUILD_SD_BACKENDS="libbareossd-fifo.la libbareossd-gentape.la libbareossd-tape.la"
 
@@ -35153,12 +35182,6 @@ echo "Cleaning up"
 echo " "
 ${MAKE:-make} clean
 
-cp ${BUILD_DIR}/debian/control.common ${BUILD_DIR}/debian/control
-DEBIAN_CONTROL_ADDITIONAL=${BUILD_DIR}/platforms/$DISTNAME/debian/control.additional
-if test -e "$DEBIAN_CONTROL_ADDITIONAL"; then
-    cat $DEBIAN_CONTROL_ADDITIONAL >> ${BUILD_DIR}/debian/control
-fi
-
 echo "
 Configuration on `date`: