diff --git a/Makefile b/Makefile
index dbce878..c93517d 100644
--- a/Makefile
+++ b/Makefile
@@ -3,8 +3,6 @@
 version:=$(shell cat ./version)
 release:=$(shell cat ./release)
 
-include assets/upstream.nightly.mk
-
 ## simplistic archive format selection
 
 #archive_create=tar cfJ
@@ -15,7 +13,6 @@ ext=.tar.gz
 #ext=.zip
 
 
-
 help : README.md
 
 	@echo "use: make [all] [check] [clean] [veryclean]"
@@ -34,6 +31,10 @@ check : README.md
 	@echo "Current release:" $$(cat ./release)
 	@make --no-print-directory -q README.md
 
+
+include upstream.mk
+
+
 all : librewolf-$(version)-$(release).source$(ext) README.md
 
 
diff --git a/upstream.mk b/assets/upstream.bootstrap.mk
similarity index 55%
rename from upstream.mk
rename to assets/upstream.bootstrap.mk
index cb37428..ee63265 100644
--- a/upstream.mk
+++ b/assets/upstream.bootstrap.mk
@@ -1,14 +1,14 @@
 ## handle different upstreams, like developer,nightly, or distro specific upstream cases
-upstream_filename=firefox-$(version).source.tar.xz
-upstream_dirname=firefox-$(version)
+upstream_filename=bootstrap.py
+upstream_dirname=mozilla-nightly
 $(upstream_filename) :
-	wget -q https://archive.mozilla.org/pub/firefox/releases/$(version)/source/firefox-$(version).source.tar.xz
+	wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
 ##
 clean_upstream_file :
 	rm -f $(upstream_filename)
 clean_upstream_dir :
 	rm -rf $(upstream_dirname)
 create_lw_from_upstream_dir :
-	tar xf $(upstream_filename)
+	python3 bootstrap.py --no-interactive --application-choice=browser
 	mv  $(upstream_dirname) librewolf-$(version)
 
diff --git a/assets/upstream.nighly.mk b/assets/upstream.nighly.mk
index ee63265..1f44d45 100644
--- a/assets/upstream.nighly.mk
+++ b/assets/upstream.nighly.mk
@@ -1,14 +1,14 @@
 ## handle different upstreams, like developer,nightly, or distro specific upstream cases
-upstream_filename=bootstrap.py
-upstream_dirname=mozilla-nightly
+upstream_filename=mozilla-unified
+upstream_dirname=mozilla-unified
 $(upstream_filename) :
-	wget -q https://hg.mozilla.org/mozilla-central/raw-file/default/python/mozboot/bin/bootstrap.py
+	hg clone https://hg.mozilla.org/mozilla-unified
+	(cd mozilla-unified && hg update)
 ##
 clean_upstream_file :
-	rm -f $(upstream_filename)
 clean_upstream_dir :
-	rm -rf $(upstream_dirname)
 create_lw_from_upstream_dir :
-	python3 bootstrap.py --no-interactive --application-choice=browser
-	mv  $(upstream_dirname) librewolf-$(version)
+	(cd mozilla-unified && hg pull)
+	(cd mozilla-unified && hg update)
+	cp -r $(upstream_dirname) librewolf-$(version)