diff --git a/src/Makefile b/src/Makefile
index 7b21149..d8a4013 100755
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,5 +1,11 @@
+PACKAGE=a2pi
+VERSION=0.9.0
 BIN= a2serclk a2pid a2joy a2joymou a2joypad a2mon a2term dskread dskwrite bintomon bload brun text2merlin merlin2text
-all: $(BIN)
+BINDIR= /usr/local/bin
+DIST=$(PACKAGE)-$(VERSION)
+DISTDIR=$(DIST)
+
+all: $(BIN) fusea2pi
 
 fusea2pi: fusea2pi.c a2lib.c
 	$(CC) -I/usr/include/fuse -D_FILE_OFFSET_BITS=64 fusea2pi.c -lfuse -o fusea2pi
@@ -8,10 +14,24 @@ clean:
 	rm $(BIN) *~ fusea2pi
 
 install:
-	$(BASH) ./install.sh
-	cp $(BIN) /usr/local/bin
+	cp $(BIN) fusea2pi a2mount $(BINDIR)
+	$(BASH) ./a2pi-setup.sh
 
-fuse-install: fusea2pi
-	cp fusea2pi /usr/local/bin
-	cp a2mount /usr/local/bin
-	chmod +x /usr/local/bin/a2mount
+uninstall:
+	cd $(BINDIR); rm $(BIN) fusea2pi a2mount
+
+dist:
+	rm -rf $(DISTDIR)
+	mkdir $(DISTDIR)
+	-chmod 777 $(DISTDIR)
+	cp ../LICENSE.txt $(DISTDIR)
+	cp ../README.md $(DISTDIR)
+	mkdir $(DISTDIR)/docs
+	cp ../docs/* $(DISTDIR)/docs
+	mkdir $(DISTDIR)/src
+	cp ../src/*.c $(DISTDIR)/src
+	cp ../src/*.sh $(DISTDIR)/src
+	cp ../src/Makefile $(DISTDIR)/src
+	-chmod -R a+r $(DISTDIR)
+	tar czf $(DIST).tar.gz $(DISTDIR)
+	rm -rf $(DISTDIR)
\ No newline at end of file