diff --git a/tools/build/toolchain.py b/tools/build/toolchain.py
index 0dd7b7e3..ae353f2c 100644
--- a/tools/build/toolchain.py
+++ b/tools/build/toolchain.py
@@ -47,8 +47,8 @@ class InternalCommands:
 	doxygen_filename = 'doxygen.cfg'
 	
 	macZipFiles = [
-		'../../bin/release/synergyc',
-		'../../bin/release/synergys',
+		'../../bin/synergyc',
+		'../../bin/synergys',
 		'../../bin/QSynergy.app',
 		'../../doc/synergy.conf.example',
 		'../../doc/MacReadme.txt']
@@ -450,6 +450,9 @@ class InternalCommands:
 		package_unsupported = False
 		unixTarget = self.defaultTarget
 		
+		if type == '' or type == None:
+			raise Exception('No type specified.')
+
 		if type != 'win' and type != 'mac':
 			self.configure(unixTarget, '-DCONF_CPACK:BOOL=TRUE')
 
@@ -547,10 +550,12 @@ class InternalCommands:
 		version = self.getVersionFromCmake()
 		zipFile = (self.project + '-' + version + '-' +
 				   self.getMacPackageName())
+		
+		binDir = self.getBinDir(unixTarget)
+		buildDir = self.getBuildDir(unixTarget)
 
 		# nb: temporary fix (just distribute a zip)
-		bin = self.getBuildDir(unixTarget)
-		self.try_chdir(bin)
+		self.try_chdir(buildDir)
 
 		try:
 			import shutil
@@ -569,7 +574,7 @@ class InternalCommands:
 				else:
 					shutil.copy2(f, zipFile + '/')
 
-			zipCmd = ('zip -r ../../' + self.getGenerator().binDir + '/' + zipFile + '.zip ' + zipFile);
+			zipCmd = ('zip -r ../../' + binDir + '/' + zipFile + '.zip ' + zipFile);
 			
 			print 'Creating package: ' + zipCmd
 			err = os.system(zipCmd)