diff --git a/dist/make_dist_ip65.rb b/dist/make_dist_ip65.rb
index 91d6d47..1eeee55 100644
--- a/dist/make_dist_ip65.rb
+++ b/dist/make_dist_ip65.rb
@@ -4,23 +4,34 @@ require 'ftools'
 
 WORKING_DIR=File.expand_path(File.dirname(__FILE__)+"/ip65")
 SRC_DIR=File.expand_path(File.dirname(__FILE__)+"/../")
-["","client","lib","bin","boot",].each do |dir_suffix|
+["","ip65","doc","cfg","drivers","inc","test","clients"].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"],
-["doc/README.txt",""],
+  ["client/ip65/*.[s|i]","ip65/"],
+  ["client/ip65/Makefile","ip65/"],
+  ["client/inc/*.i","inc/"],
+  ["client/test/*.[s|i]","test/"],
+  ["client/test/Makefile","test/"],
+  ["client/drivers/*.[s|i]","drivers/"],
+  ["client/drivers/Makefile","drivers/"],
+  ["client/cfg/*","cfg/"],
+   ["doc/ip65.html","doc/"],
+  ["client/Makefile","/"],  
 ].each do |args|
-  src="#{SRC_DIR}/#{args[0]}"
   dest="#{WORKING_DIR}/#{args[1]}"
-  File.copy(src,dest)
+  Dir["#{SRC_DIR}/#{args[0]}"].each do |src|
+    File.copy(src,dest)
+    puts "#{src}->#{dest}"
+  end  
 end
 
-zipfile_name=File.dirname(__FILE__)+"/netboot65-#{Time.now.strftime("%Y-%m-%d")}.zip"
+dummy_makefile=File.new("#{WORKING_DIR}/clients/Makefile","w")
+dummy_makefile<<"#dummy makefile, so we can reuse the top level Makefile from the netboot65/clients directory\nall:\n"
+dummy_makefile.close
+
+zipfile_name=File.dirname(__FILE__)+"/ip65-#{Time.now.strftime("%Y-%m-%d")}.zip"
 Archive::Zip.archive(zipfile_name, WORKING_DIR)
+