diff --git a/debian/.gitignore b/debian/.gitignore
index 525ef4c..0df9f2d 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -4,6 +4,8 @@
 /.debhelper/
 /debhelper-build-stamp
 /files
+/ngcp-addons-ce/
+/ngcp-addons-pro/
 /ngcp-cloudpbx-pro/
 /ngcp-config-carrier/
 /ngcp-config-ce/
@@ -11,8 +13,6 @@
 /ngcp-ngcp-carrier/
 /ngcp-ngcp-ce/
 /ngcp-ngcp-pro/
-/ngcp-nth-ce/
-/ngcp-nth-pro/
 /ngcp-services-carrier/
 /ngcp-services-ce/
 /ngcp-services-pro/
diff --git a/debian/control b/debian/control
index 2b0417a..b08244e 100644
--- a/debian/control
+++ b/debian/control
@@ -103,10 +103,10 @@ Description: Metapackage for Sipwise's NGCP CloudPBX
 Package: ngcp-ngcp-pro
 Architecture: all
 Depends:
+ ngcp-addons-pro,
  ngcp-cloudpbx-pro,
  ngcp-config-pro,
  ngcp-keyring,
- ngcp-nth-pro,
  ngcp-services-pro,
  ${misc:Depends},
 Provides:
@@ -122,9 +122,9 @@ Description: Metapackage for Sipwise's NGCP
 Package: ngcp-ngcp-ce
 Architecture: all
 Depends:
+ ngcp-addons-ce,
  ngcp-config-ce,
  ngcp-keyring,
- ngcp-nth-ce,
  ngcp-services-ce,
  ${misc:Depends},
 Provides:
@@ -140,10 +140,10 @@ Description: Metapackage for Sipwise's NGCP
 Package: ngcp-ngcp-carrier
 Architecture: all
 Depends:
+ ngcp-addons-pro,
  ngcp-cloudpbx-pro,
  ngcp-config-carrier,
  ngcp-keyring,
- ngcp-nth-pro,
  ngcp-services-carrier,
  ${misc:Depends},
 Provides:
@@ -156,8 +156,14 @@ Description: Metapackage for Sipwise's NGCP
  This metapackage installs all the packages needed in a NGCP
  sip:provider CARRIER environment.
 
-Package: ngcp-nth-pro
+Package: ngcp-addons-pro
 Architecture: all
+Conflicts:
+ ngcp-nth-pro,
+Replaces:
+ ngcp-nth-pro,
+Provides:
+ ngcp-nth-pro,
 Depends:
  acpi,
  acpi-support-base,
@@ -211,12 +217,23 @@ Depends:
  vlan,
  wget,
  ${misc:Depends},
-Description: Metapackage for Nice To Have tools in NGCP
- This metapackage installs several nice to have tools in a NGCP
+Description: Metapackage for Add-Ons in NGCP
+ This metapackage installs several add-on packages that are not necessary as
+ part of normal operation, but which extend the functionality in a NGCP
  sip:provider PRO.
+ .
+ This is a separate package, so that in case of dependency problems during
+ upgrades, it might be removed without affecting the core functionality of
+ the NGCP system.
 
-Package: ngcp-nth-ce
+Package: ngcp-addons-ce
 Architecture: all
+Conflicts:
+ ngcp-nth-ce,
+Replaces:
+ ngcp-nth-ce,
+Provides:
+ ngcp-nth-ce,
 Depends:
  acpi,
  acpi-support-base,
@@ -264,9 +281,14 @@ Depends:
  vlan,
  wget,
  ${misc:Depends},
-Description: Metapackage for Nice To Have tools in NGCP
- This metapackage installs several nice to have tools in a NGCP
+Description: Metapackage for Add-Ons in NGCP
+ This metapackage installs several add-on packages that are not necessary as
+ part of normal operation, but which extend the functionality in a NGCP
  sip:provider CE.
+ .
+ This is a separate package, so that in case of dependency problems during
+ upgrades, it might be removed without affecting the core functionality of
+ the NGCP system.
 
 Package: ngcp-services-pro
 Architecture: all