diff -Nru firefox-esr-52.2.0esr/debian/changelog firefox-esr-52.2.0esr/debian/changelog
--- firefox-esr-52.2.0esr/debian/changelog	2017-06-13 22:53:34.000000000 +0000
+++ firefox-esr-52.2.0esr/debian/changelog	2017-06-28 00:55:34.000000000 +0000
@@ -1,3 +1,9 @@
+firefox-esr (52.2.0esr-1+rpi1) buster-staging; urgency=medium
+
+  * Force "dist=stretch" for now until Debian sorts their shit out.
+
+ -- Peter Michael Green <plugwash@raspbian.org>  Wed, 28 Jun 2017 00:55:34 +0000
+
 firefox-esr (52.2.0esr-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru firefox-esr-52.2.0esr/debian/upstream.mk firefox-esr-52.2.0esr/debian/upstream.mk
--- firefox-esr-52.2.0esr/debian/upstream.mk	2017-06-13 22:53:34.000000000 +0000
+++ firefox-esr-52.2.0esr/debian/upstream.mk	2017-06-28 00:55:16.000000000 +0000
@@ -38,22 +38,22 @@
 UPSTREAM_RELEASE := $(firstword $(subst +, ,$(UPSTREAM_RELEASE)))
 # If the debian part of the version contains ~bpo or ~deb, it's a backport
 DEBIAN_RELEASE_EXTRA := $(word 2,$(subst ~, ,$(DEBIAN_RELEASE)))
-DIST = unknown
-ifneq (,$(filter testing% unstable,$(DEB_DISTRIBUTION)))
+#DIST = unknown
+#ifneq (,$(filter testing% unstable,$(DEB_DISTRIBUTION)))
 DIST = stretch
-endif
-ifneq (,$(filter bpo% deb%,$(DEBIAN_RELEASE_EXTRA)))
-DEBIAN_TARGET := $(subst bpo,,$(subst deb,,$(DEBIAN_RELEASE_EXTRA)))
-ifneq (,$(filter 7%,$(DEBIAN_TARGET)))
-DIST = wheezy
-endif
-ifneq (,$(filter 8%,$(DEBIAN_TARGET)))
-DIST = jessie
-endif
-ifneq (,$(filter 9%,$(DEBIAN_TARGET)))
-DIST = stretch
-endif
-endif
+#endif
+#ifneq (,$(filter bpo% deb%,$(DEBIAN_RELEASE_EXTRA)))
+#DEBIAN_TARGET := $(subst bpo,,$(subst deb,,$(DEBIAN_RELEASE_EXTRA)))
+#ifneq (,$(filter 7%,$(DEBIAN_TARGET)))
+#DIST = wheezy
+#endif
+#ifneq (,$(filter 8%,$(DEBIAN_TARGET)))
+#DIST = jessie
+#endif
+#ifneq (,$(filter 9%,$(DEBIAN_TARGET)))
+#DIST = stretch
+#endif
+#endif
 
 PRODUCT_NAME := $(DEBIAN_SOURCE)