diff --git a/build/minify.sh b/build/minify.sh
index 1a1f29a3..6b564e03 100755
--- a/build/minify.sh
+++ b/build/minify.sh
@@ -12,4 +12,7 @@
 
 # We need to keep dead_code around for now, since the very odd JavaScriptCore
 # scope bug fix (nop().nop()) requires it.
-uglifyjs ../dist/paper.js -o ../dist/paper-min.js -c unused=false,dead_code=false -m -r "_$_,$_" -b ascii_only=true,beautify=false --comments /^!/
+# TODO: uglifyjs gets confused about Base and Color constructor naming, so we
+# have to tell it to not rename these. It's also not renaming all the local
+# references to classes which could yield a lot of size improvements.
+uglifyjs ../dist/paper.js -o ../dist/paper-min.js -c unsafe=true,unused=false,dead_code=false,hoist_funs=false -m -r "Base,Color,_$_,$_" -b ascii_only=true,beautify=false --comments /^!/