diff --git a/.gitmodules b/.gitmodules
index 61ecb53f..f6b5da7d 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,6 @@
 [submodule "buildscript"]
 	path = buildscript
 	url = https://github.com/piroor/makexpi.git
+[submodule "makexpi"]
+	path = makexpi
+	url = https://github.com/piroor/makexpi.git
diff --git a/Makefile b/Makefile
index 6fb67462..01534d1b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,17 @@
 PACKAGE_NAME = treestyletab
 
+.PHONY: all xpi signed clean
+
 all: xpi
 
-xpi: buildscript/makexpi.sh
-	cp buildscript/makexpi.sh ./
-	./makexpi.sh -n $(PACKAGE_NAME) -o
-	rm ./makexpi.sh
+xpi: makexpi/makexpi.sh
+	makexpi/makexpi.sh -n $(PACKAGE_NAME) -o
 
-buildscript/makexpi.sh:
+makexpi/makexpi.sh:
 	git submodule update --init
+
+signed: xpi
+	makexpi/sign_xpi.sh -k $(JWT_KEY) -s $(JWT_SECRET) -p ./$(PACKAGE_NAME)_noupdate.xpi
+
+clean:
+	rm $(PACKAGE_NAME).xpi $(PACKAGE_NAME)_noupdate.xpi sha1hash.txt
diff --git a/buildscript b/buildscript
deleted file mode 160000
index 950375c3..00000000
--- a/buildscript
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 950375c3414066db2ff48e45cf681c79e1085d90
diff --git a/make.sh b/make.sh
index 744e1b32..cc317ba6 100755
--- a/make.sh
+++ b/make.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-cp buildscript/makexpi.sh ./
+cp makexpi/makexpi.sh ./
 ./makexpi.sh -n treestyletab -o
 rm ./makexpi.sh
 
diff --git a/makexpi b/makexpi
new file mode 160000
index 00000000..5be67b8e
--- /dev/null
+++ b/makexpi
@@ -0,0 +1 @@
+Subproject commit 5be67b8e7286e5f90efade2b3186e7683c3f9afe