diff --git a/Makefile b/Makefile
index 6b9b8d6..95a0e5c 100644
--- a/Makefile
+++ b/Makefile
@@ -7,19 +7,26 @@
 #
 
 PG_CONFIG ?= pg_config
+EXTENSION = pg_repack
 
-# Pull out the version number from pg_config
+.PHONY: dist/$(EXTENSION)-$(EXTVERSION).zip
+
+# Pull out PostgreSQL version number from pg_config
 VERSION := $(shell $(PG_CONFIG) --version | awk '{print $$2}')
 ifeq ("$(VERSION)","")
 $(error pg_config not found)
 endif
 
-# version as a number, e.g. 9.1.4 -> 901
+# PostgreSQL version as a number, e.g. 9.1.4 -> 901
 INTVERSION := $(shell echo $$(($$(echo $(VERSION) | sed 's/\([[:digit:]]\{1,\}\)\.\([[:digit:]]\{1,\}\).*/\1*100+\2/'))))
 
+# The version number of the library
+EXTVERSION = $(shell grep '"version":' META.json | head -1 \
+	| sed -e 's/[ 	]*"version":[ 	]*"\(.*\)",/\1/')
+
 # We support PostgreSQL 8.3 and later.
 ifeq ($(shell echo $$(($(INTVERSION) < 803))),1)
-$(error pg_repack requires PostgreSQL 8.3 or later. This is $(VERSION))
+$(error $(EXTENSION) requires PostgreSQL 8.3 or later. This is $(VERSION))
 endif
 
 
@@ -36,3 +43,9 @@ check installcheck:
 		$(MAKE) -C $$dir $@ || CHECKERR=$$?; \
 	done; \
 	exit $$CHECKERR
+
+# Prepare the package for PGXN submission
+package: $(EXTENSION)-$(EXTVERSION).zip
+
+$(EXTENSION)-$(EXTVERSION).zip:
+	git archive --format zip --prefix=$(EXTENSION)-$(EXTVERSION)/ --output $@ master