diff -Nru thunderbird-53.0~b1+build2/debian/build/rules.mk thunderbird-53.0~b1+build2/debian/build/rules.mk
--- thunderbird-53.0~b1+build2/debian/build/rules.mk	2017-03-24 15:06:31.000000000 +0000
+++ thunderbird-53.0~b1+build2/debian/build/rules.mk	2017-03-24 15:06:31.000000000 +0000
@@ -192,10 +192,6 @@
 	$(MOZ_APPNAME_SUBST_FILES) \
 	$(NULL)
 
-pkgconfig_files = \
-	$(MOZ_PKGCONFIG_FILES) \
-	$(NULL)
-
 #debian/tests/control: debian/tests/control.in
 #	sed -e 's/@MOZ_PKG_NAME@/$(MOZ_PKG_NAME)/g' < debian/tests/control.in > debian/tests/control
 
@@ -273,8 +269,8 @@
 		$(MAKE) langpack-$* LOCALE_MERGEDIR=$(CURDIR)/debian/l10n-mergedirs/$* || exit 1;
 	@touch $@
 
-#common-build-arch:: make-langpack-xpis $(pkgconfig_files) make-testsuite run-tests
-common-build-arch:: make-langpack-xpis $(pkgconfig_files)
+#common-build-arch:: make-langpack-xpis make-testsuite run-tests
+common-build-arch:: make-langpack-xpis
 
 install/$(MOZ_PKG_NAME)::
 	@echo "Adding suggests / recommends on support packages"
diff -Nru thunderbird-53.0~b1+build2/debian/changelog thunderbird-53.0~b1+build2/debian/changelog
--- thunderbird-53.0~b1+build2/debian/changelog	2017-03-24 15:06:31.000000000 +0000
+++ thunderbird-53.0~b1+build2/debian/changelog	2017-03-24 15:06:31.000000000 +0000
@@ -1,4 +1,4 @@
-thunderbird (1:53.0~b1+build2-0ubuntu0.14.04.1) trusty; urgency=medium
+thunderbird (1:53.0~b1+build2-0ubuntu0.14.04.2) trusty; urgency=medium
 
   [ Rico Tzschichholz ]
   * New upstream release from the beta channel (THUNDERBIRD_53_0b1_BUILD2)
@@ -12,6 +12,12 @@
   [ Chris Coulson ]
   * Update unity-menubar.patch with the latest version submitted upstream
   * Build with --disable-rust for now
+  * Stop installing the NPAPI headers and make thunderbird-dev a transitional
+    package
+    - update debian/build/rules.mk
+    - update debian/control{,.in}
+    - remove debian/thunderbird-dev.install.in
+    - remove debian/thunderbird-dev.links.in
 
  -- Rico Tzschichholz <ricotz@ubuntu.com>  Fri, 24 Mar 2017 16:06:31 +0100
 
diff -Nru thunderbird-53.0~b1+build2/debian/control thunderbird-53.0~b1+build2/debian/control
--- thunderbird-53.0~b1+build2/debian/control	2017-03-24 15:06:31.000000000 +0000
+++ thunderbird-53.0~b1+build2/debian/control	2017-03-24 15:06:31.000000000 +0000
@@ -98,23 +98,11 @@
 
 Package: thunderbird-dev
 Architecture: any
-Section: devel
-Depends: thunderbird (= ${binary:Version}),
-	${misc:Depends},
-	${shlibs:Depends}
-Conflicts: ${app:Conflicts}
-Provides: ${app:Provides}
+Section: oldlibs
+Depends: ${misc:Depends}
 Description: Email, RSS and newsgroup client - development files
- Thunderbird is a full-featured email, RSS and newsgroup client that makes
- emailing safer, faster and easier than ever before. It supports different mail
- accounts (POP, IMAP, Gmail), has a simple mail account setup wizard, one-
- click address book, tabbed interface, an integrated learning spam filter,
- advanced search and indexing capabilities, and offers easy organization
- of mails with tagging and virtual folders. It also features unrivalled
- extensibility.
- .
- This package contains the headers and SDK for building plugins and extensions
- with Thunderbird
+ This is a transitional package to ensure that upgrades work correctly.
+ It can be safely removed
 
 Package: thunderbird-dbg
 Architecture: any
diff -Nru thunderbird-53.0~b1+build2/debian/control.in thunderbird-53.0~b1+build2/debian/control.in
--- thunderbird-53.0~b1+build2/debian/control.in	2017-03-24 15:06:31.000000000 +0000
+++ thunderbird-53.0~b1+build2/debian/control.in	2017-03-24 15:06:31.000000000 +0000
@@ -98,23 +98,11 @@
 
 Package: @MOZ_PKG_NAME@-dev
 Architecture: any
-Section: devel
-Depends: @MOZ_PKG_NAME@ (= ${binary:Version}),
-	${misc:Depends},
-	${shlibs:Depends}
-Conflicts: ${app:Conflicts}
-Provides: ${app:Provides}
+Section: oldlibs
+Depends: ${misc:Depends}
 Description: Email, RSS and newsgroup client - development files
- Thunderbird is a full-featured email, RSS and newsgroup client that makes
- emailing safer, faster and easier than ever before. It supports different mail
- accounts (POP, IMAP, Gmail), has a simple mail account setup wizard, one-
- click address book, tabbed interface, an integrated learning spam filter,
- advanced search and indexing capabilities, and offers easy organization
- of mails with tagging and virtual folders. It also features unrivalled
- extensibility.
- .
- This package contains the headers and SDK for building plugins and extensions
- with Thunderbird
+ This is a transitional package to ensure that upgrades work correctly.
+ It can be safely removed
 
 Package: @MOZ_PKG_NAME@-dbg
 Architecture: any
diff -Nru thunderbird-53.0~b1+build2/debian/thunderbird-dev.install.in thunderbird-53.0~b1+build2/debian/thunderbird-dev.install.in
--- thunderbird-53.0~b1+build2/debian/thunderbird-dev.install.in	2016-02-02 16:26:27.000000000 +0000
+++ thunderbird-53.0~b1+build2/debian/thunderbird-dev.install.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,6 +0,0 @@
-@MOZ_INCDIR@
-@MOZ_IDLDIR@
-
-@MOZ_SDKDIR@/sdk/lib/*.a
-@MOZ_SDKDIR@/*.h
-@MOZ_SDKDIR@/sdk/bin
diff -Nru thunderbird-53.0~b1+build2/debian/thunderbird-dev.links.in thunderbird-53.0~b1+build2/debian/thunderbird-dev.links.in
--- thunderbird-53.0~b1+build2/debian/thunderbird-dev.links.in	2016-02-02 16:26:27.000000000 +0000
+++ thunderbird-53.0~b1+build2/debian/thunderbird-dev.links.in	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-@MOZ_LIBDIR@ @MOZ_SDKDIR@/bin
-@MOZ_IDLDIR@ @MOZ_SDKDIR@/idl
-@MOZ_INCDIR@ @MOZ_SDKDIR@/include
-@MOZ_SDKDIR@/sdk/lib @MOZ_SDKDIR@/lib
-@MOZ_LIBDIR@/libnspr4.so @MOZ_SDKDIR@/sdk/lib/libnspr4.so
-@MOZ_LIBDIR@/libplc4.so @MOZ_SDKDIR@/sdk/lib/libplc4.so
-@MOZ_LIBDIR@/libplds4.so @MOZ_SDKDIR@/sdk/lib/libplds4.so
-@MOZ_LIBDIR@/libmozalloc.so @MOZ_SDKDIR@/sdk/lib/libmozalloc.so
-@MOZ_LIBDIR@/libxpcom.so @MOZ_SDKDIR@/sdk/lib/libxpcom.so
-@MOZ_LIBDIR@/libxul.so @MOZ_SDKDIR@/sdk/lib/libxul.so