diff --git a/Makefile b/Makefile
index 11b15a0..c87341a 100644
--- a/Makefile
+++ b/Makefile
@@ -13,8 +13,7 @@ build:
 	@echo "creating build directory"
 	mkdir build
 
-profile.tgz: build/profile/user.js build/profile/bookmarks.html \
-	     build/profile/extensions/NoScript.xpi build/profile/extensions/HTTPSEverywhere.xpi
+profile.tgz: build/profile/user.js build/profile/bookmarks.html copy-xpi
 	@echo "building profile tarball"
 	cd build && tar -czf profile.tgz profile && cp profile.tgz ../
 
@@ -24,11 +23,15 @@ build/profile/user.js: build/profile src/profile/user.js
 build/profile/bookmarks.html: build/profile src/profile/bookmarks.html
 	cp src/profile/bookmarks.html build/profile/bookmarks.html
 
-build/profile/extensions/NoScript.xpi: build/profile/extensions NoScript.url
-	curl `cat NoScript.url` > build/profile/extensions/NoScript.xpi
+copy-xpi: build/NoScript.xpi build/HTTPSEverywhere.xpi build/profile/extensions
+	cp build/NoScript.xpi "build/profile/extensions/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
+	cp build/HTTPSEverywhere.xpi "build/profile/extensions/https-everywhere-eff@eff.org.xpi"
 
-build/profile/extensions/HTTPSEverywhere.xpi : build/profile/extensions HTTPSEverywhere.url
-	curl `cat HTTPSEverywhere.url` > build/profile/extensions/HTTPSEverywhere.xpi
+build/NoScript.xpi: build/ NoScript.url
+	curl `cat NoScript.url` > build/NoScript.xpi
+
+build/HTTPSEverywhere.xpi : build HTTPSEverywhere.url
+	curl `cat HTTPSEverywhere.url` > build/HTTPSEverywhere.xpi
 
 build/profile/extensions: build/profile
 	mkdir build/profile/extensions