diff --git a/.gitignore b/.gitignore
index b9428a4f..704861d8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ po/gnome-shell-extensions.pot
 po/POTFILES
 po/stamp-it
 staging/
+zip-files/
 
 *~
 *.gmo
diff --git a/Makefile.am b/Makefile.am
index fb9fccae..5cc48359 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,15 +11,15 @@ include include.mk
 zip-file: all
 	-rm -fR $(builddir)/_build
 	-rm -fR $(builddir)/zip-files
-	mkdir $(builddir)/_build; \
-	mkdir $(builddir)/zip-files; \
+	$(MKDIR_P) $(builddir)/_build; \
+	$(MKDIR_P) $(builddir)/zip-files; \
 	$(MAKE) install DESTDIR="$(abs_builddir)/_build"; \
 	for i in $(ENABLED_EXTENSIONS); do \
 		mv "$(builddir)/_build$(topextensiondir)/$${i}$(extensionbase)" "$(builddir)/_build/"; \
 		cp -r "$(builddir)/_build$(datadir)/locale" "$(builddir)/_build/$${i}$(extensionbase)"; \
 		cp "$(srcdir)/COPYING" -t "$(builddir)/_build/$${i}$(extensionbase)"; \
 		if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" ]; then \
-			mkdir "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
+			$(MKDIR_P) "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
 			mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/$(gschemabase).$${i}.gschema.xml" "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
 			glib-compile-schemas "$(builddir)/_build/$${i}$(extensionbase)/schemas"; \
 		fi; \
@@ -27,3 +27,19 @@ zip-file: all
 		 zip -qr "$(abs_builddir)/zip-files/$${i}$(extensionbase).shell-extension.zip" .; \
 		); \
 	done
+	-rm -fR $(builddir)/_build
+
+localprefix = $(HOME)/.local/share/gnome-shell/extensions
+
+local-install: zip-file
+	for i in $(ENABLED_EXTENSIONS); do \
+	    uuid="$${i}$(extensionbase)"; \
+	    zip_file="$(abs_builddir)/zip-files/$${uuid}.shell-extension.zip"; \
+	    if [ -d "$(localprefix)/$${uuid}" ]; then \
+		rm -fR "$(localprefix)/$${uuid}"; \
+	    fi; \
+	    $(MKDIR_P) $(localprefix)/$${uuid}; \
+	    (cd $(localprefix)/$${uuid}; \
+		unzip -q $${zip_file}; \
+	    ); \
+	done
diff --git a/local-install.sh b/local-install.sh
deleted file mode 100755
index 2a3ef0df..00000000
--- a/local-install.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-extensionbase=~/.local/share/gnome-shell/extensions
-
-for i in zip-files/*; do
-    zip_file=`pwd`/$i;
-    uuid=`basename $i | sed -e "s/.shell-extension.zip//"`;
-    if [ -d $extensionbase/$uuid ]; then
-	rm -fR $extensionbase/$uuid;
-    fi
-    mkdir $extensionbase/$uuid;
-    (cd $extensionbase/$uuid;
-	unzip -q $zip_file;
-    );
-done