diff --git a/debian/bootstrap.sh b/debian/bootstrap.sh
index f9835c4546..dadbaf82ae 100755
--- a/debian/bootstrap.sh
+++ b/debian/bootstrap.sh
@@ -18,7 +18,7 @@ shift $(($OPTIND-1))
 
 if [ x${use_sysvinit} = x ]; then
     case "$codename" in
-      wheezy|trusty|utopic) use_sysvinit="true";;
+      wheezy|trusty|utopic|xenial) use_sysvinit="true";;
       *) use_sysvinit="false";;
     esac
 fi
@@ -29,7 +29,7 @@ lang_dir="../conf/vanilla/lang"
 fs_description="FreeSWITCH is a scalable open source cross-platform telephony platform designed to route and interconnect popular communication protocols using audio, video, text or any other form of media."
 mod_build_depends="." mod_depends="." mod_recommends="." mod_suggests="."
 supported_debian_distros="wheezy jessie stretch sid"
-supported_ubuntu_distros="trusty utopic"
+supported_ubuntu_distros="trusty utopic xenial"
 supported_distros="$supported_debian_distros $supported_ubuntu_distros"
 avoid_mods=(
   applications/mod_sms_flowroute
@@ -79,9 +79,17 @@ avoid_mods_wheezy=(
 )
 avoid_mods_trusty=(
   event_handlers/mod_amqp
+  codecs/mod_sangoma_codec
 )
 avoid_mods_utopic=(
   directories/mod_ldap
+  codecs/mod_sangoma_codec
+)
+avoid_mods_xenial=(
+  event_handlers/mod_ldap
+  event_handlers/mod_amqp
+  codecs/mod_sangoma_codec
+  asr_tts/mod_flite
 )
 manual_pkgs=(
 freeswitch-all
@@ -309,7 +317,7 @@ Build-Depends:
 # configure options
  libssl-dev, unixodbc-dev, libpq-dev,
  libncurses5-dev, libjpeg62-turbo-dev | libjpeg-turbo8-dev | libjpeg62-dev | libjpeg8-dev,
- python-dev, python-all-dev, python-support (>= 0.90), erlang-dev,
+ python-dev, python-all-dev, python-support (>= 0.90) | dh-python, erlang-dev,
 # documentation
  doxygen,
 # for APR (not essential for build)
diff --git a/debian/control-modules b/debian/control-modules
index c6dae250b7..5759803197 100644
--- a/debian/control-modules
+++ b/debian/control-modules
@@ -11,7 +11,7 @@ Description: Abstraction layer for APIs
 Module: applications/mod_av
 Description: mod_av
  Adds mod_av.
-Build-Depends: libavformat-dev, libswscale-dev
+Build-Depends: libavformat-dev, libswscale-dev, libavresample-dev
 
 Module: applications/mod_avmd
 Description: Advanced voicemail detection
@@ -645,7 +645,7 @@ Build-Depends: libperl-dev
 Module: languages/mod_python
 Description: mod_python
  Adds mod_python.
-Build-Depends: python-dev
+Build-Depends: python-dev 
 
 Module: languages/mod_v8
 Description: mod_v8
@@ -790,4 +790,3 @@ Description: mod_xml_rpc
 Module: xml_int/mod_xml_scgi
 Description: mod_xml_scgi
  Adds mod_xml_scgi.
-