diff --git a/Makefile b/Makefile
index 3446a13a..35bfa425 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 NAME=svg-edit
 VERSION=2.5
-MAKEDOCS=naturaldocs/NaturalDocs
 PACKAGE=$(NAME)-$(VERSION)
-YUI=build/yuicompressor.jar
+MAKEDOCS=naturaldocs/NaturalDocs
+CLOSURE=build/tools/closure-compiler.jar
+YUICOMPRESS=build/tools/yuicompressor.jar
 ZIP=zip
 
 all: release firefox opera
@@ -10,18 +11,21 @@ all: release firefox opera
 build/$(PACKAGE):
 	rm -rf config
 	mkdir config
-	$(MAKEDOCS) -i editor/ -o html docs/ -p config/ -oft -r
+	if [ -x $(MAKEDOCS) ] ; then $(MAKEDOCS) -i editor/ -o html docs/ -p config/ -oft -r ; fi
 	mkdir -p build/$(PACKAGE)
 	cp -r editor/* build/$(PACKAGE)
 	-find build/$(PACKAGE) -name .svn -type d -exec rm -rf {} \;
 # minify spin button
-	java -jar $(YUI) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.js
+	java -jar $(YUICOMPRESS)  build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js                > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.js
+	java -jar $(CLOSURE) --js build/$(PACKAGE)/spinbtn/JQuerySpinBtn.js --js_output_file build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min-closure.js
 # minify SVG-edit files
-	java -jar $(YUI) build/$(PACKAGE)/svg-editor.js > build/$(PACKAGE)/svg-editor.min.js
-	java -jar $(YUI) build/$(PACKAGE)/svgcanvas.js > build/$(PACKAGE)/svgcanvas.min.js
+	java -jar $(YUICOMPRESS)  build/$(PACKAGE)/svg-editor.js                > build/$(PACKAGE)/svg-editor.min.js
+	java -jar $(CLOSURE) --js build/$(PACKAGE)/svg-editor.js --js_output_file build/$(PACKAGE)/svg-editor.min-closure.js
+	java -jar $(YUICOMPRESS)  build/$(PACKAGE)/svgcanvas.js                 > build/$(PACKAGE)/svgcanvas.min.js
+	java -jar $(CLOSURE) --js build/$(PACKAGE)/svgcanvas.js  --js_output_file build/$(PACKAGE)/svgcanvas.min-closure.js
 # CSS files do not work remotely
-# java -jar $(YUI) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.css > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.css
-# java -jar $(YUI) build/$(PACKAGE)/svg-editor.css > build/$(PACKAGE)/svg-editor.min.css
+# java -jar $(YUICOMPRESS) build/$(PACKAGE)/spinbtn/JQuerySpinBtn.css > build/$(PACKAGE)/spinbtn/JQuerySpinBtn.min.css
+# java -jar $(YUICOMPRESS) build/$(PACKAGE)/svg-editor.css > build/$(PACKAGE)/svg-editor.min.css
 
 release: build/$(PACKAGE)
 	cd build ; $(ZIP) $(PACKAGE).zip -r $(PACKAGE) ; cd ..
diff --git a/build/tools/closure-compiler.jar b/build/tools/closure-compiler.jar
new file mode 100644
index 00000000..7374f2d3
Binary files /dev/null and b/build/tools/closure-compiler.jar differ
diff --git a/build/yuicompressor.jar b/build/tools/yuicompressor.jar
similarity index 100%
rename from build/yuicompressor.jar
rename to build/tools/yuicompressor.jar