diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..3c38004
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+.PHONY: client clean dist distclean
+
+all: client dist
+
+client:
+	make -C client all
+
+clean:	
+	make -C client clean
+
+dist:
+	ruby dist\make_dist.rb
+  
+distclean:
+	make -C client distclean
+	rm -f *~
diff --git a/dist/make_dist.rb b/dist/make_dist.rb
new file mode 100644
index 0000000..606f840
--- /dev/null
+++ b/dist/make_dist.rb
@@ -0,0 +1,25 @@
+gem 'archive-zip' 
+require 'archive/zip'
+require 'ftools'
+
+WORKING_DIR=File.expand_path(File.dirname(__FILE__)+"/netboot65")
+SRC_DIR=File.expand_path(File.dirname(__FILE__)+"/../")
+["","client","lib","bin","boot"].each do |dir_suffix|
+  dir_path="#{WORKING_DIR}/#{dir_suffix}"
+  Dir.mkdir(dir_path) unless File.exist?(dir_path)
+end
+
+[
+["client/clients/utherboot.dsk","client/"],
+["server/lib/tftp_server.rb","lib"],
+["server/bin/tftp_only_server.rb","bin/tftp_server.rb"],
+["server/bin/import_ags_games.rb","bin"],
+["server/boot/BOOTA2.PG2","boot"],
+].each do |args|
+  src="#{SRC_DIR}/#{args[0]}"
+  dest="#{WORKING_DIR}/#{args[1]}"
+  File.copy(src,dest)
+end
+
+zipfile_name=File.dirname(__FILE__)+"/netboot65-#{Time.now.strftime("%Y-%m-%d")}.zip"
+Archive::Zip.archive(zipfile_name, WORKING_DIR)