diff --git a/build/build.sh b/build/build.sh
index bbcf4ff86d..4a3ea0f1b9 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -16,6 +16,7 @@ SRC_DIR=../lib
 CMD_MERGE_JS=${TOOLS_DIR}/mergejs.py
 
 CMD_SHRINKSAFE=${TOOLS_DIR}/shrinksafe.py
+CMD_JSMIN=${TOOLS_DIR}/jsmin.py
 
 LICENSE_HEADER_FILENAME=license.txt
 
@@ -29,7 +30,8 @@ ${CMD_MERGE_JS} -c ${CFG_FILENAME} ${TMP_OUTPUT_FILENAME} ${SRC_DIR}
 echo
 echo Shrinking and post-processing...
 # (We also append the license header here.)
-${CMD_SHRINKSAFE} ${TMP_OUTPUT_FILENAME} | cat ${LICENSE_HEADER_FILENAME} - > ${OUTPUT_FILENAME}
+cat ${LICENSE_HEADER_FILENAME} > ${OUTPUT_FILENAME}
+${CMD_JSMIN} <${TMP_OUTPUT_FILENAME} >> ${OUTPUT_FILENAME}
 
 echo
 echo Done.
diff --git a/tools/jsmin.c b/tools/jsmin.c
new file mode 100644
index 0000000000..86d53da3af
--- /dev/null
+++ b/tools/jsmin.c
@@ -0,0 +1,272 @@
+/* jsmin.c
+   2006-05-04
+
+Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+The Software shall be used for Good, not Evil.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include <stdlib.h>
+#include <stdio.h>
+
+static int   theA;
+static int   theB;
+static int   theLookahead = EOF;
+
+
+/* isAlphanum -- return true if the character is a letter, digit, underscore,
+        dollar sign, or non-ASCII character.
+*/
+
+static int
+isAlphanum(int c)
+{
+    return ((c >= 'a' && c <= 'z') || (c >= '0' && c <= '9') ||
+        (c >= 'A' && c <= 'Z') || c == '_' || c == '$' || c == '\\' ||
+        c > 126);
+}
+
+
+/* get -- return the next character from stdin. Watch out for lookahead. If
+        the character is a control character, translate it to a space or
+        linefeed.
+*/
+
+static int
+get()
+{
+    int c = theLookahead;
+    theLookahead = EOF;
+    if (c == EOF) {
+        c = getc(stdin);
+    }
+    if (c >= ' ' || c == '\n' || c == EOF) {
+        return c;
+    }
+    if (c == '\r') {
+        return '\n';
+    }
+    return ' ';
+}
+
+
+/* peek -- get the next character without getting it.
+*/
+
+static int
+peek()
+{
+    theLookahead = get();
+    return theLookahead;
+}
+
+
+/* next -- get the next character, excluding comments. peek() is used to see
+        if a '/' is followed by a '/' or '*'.
+*/
+
+static int
+next()
+{
+    int c = get();
+    if  (c == '/') {
+        switch (peek()) {
+        case '/':
+            for (;;) {
+                c = get();
+                if (c <= '\n') {
+                    return c;
+                }
+            }
+        case '*':
+            get();
+            for (;;) {
+                switch (get()) {
+                case '*':
+                    if (peek() == '/') {
+                        get();
+                        return ' ';
+                    }
+                    break;
+                case EOF:
+                    fprintf(stderr, "Error: JSMIN Unterminated comment.\n");
+                    exit(1);
+                }
+            }
+        default:
+            return c;
+        }
+    }
+    return c;
+}
+
+
+/* action -- do something! What you do is determined by the argument:
+        1   Output A. Copy B to A. Get the next B.
+        2   Copy B to A. Get the next B. (Delete A).
+        3   Get the next B. (Delete B).
+   action treats a string as a single character. Wow!
+   action recognizes a regular expression if it is preceded by ( or , or =.
+*/
+
+static void
+action(int d)
+{
+    switch (d) {
+    case 1:
+        putc(theA, stdout);
+    case 2:
+        theA = theB;
+        if (theA == '\'' || theA == '"') {
+            for (;;) {
+                putc(theA, stdout);
+                theA = get();
+                if (theA == theB) {
+                    break;
+                }
+                if (theA <= '\n') {
+                    fprintf(stderr,
+"Error: JSMIN unterminated string literal: %c\n", theA);
+                    exit(1);
+                }
+                if (theA == '\\') {
+                    putc(theA, stdout);
+                    theA = get();
+                }
+            }
+        }
+    case 3:
+        theB = next();
+        if (theB == '/' && (theA == '(' || theA == ',' || theA == '=' ||
+                theA == ':' || theA == '[' || theA == '!' || theA == '&' || 
+                theA == '|')) {
+            putc(theA, stdout);
+            putc(theB, stdout);
+            for (;;) {
+                theA = get();
+                if (theA == '/') {
+                    break;
+                } else if (theA =='\\') {
+                    putc(theA, stdout);
+                    theA = get();
+                } else if (theA <= '\n') {
+                    fprintf(stderr,
+"Error: JSMIN unterminated Regular Expression literal.\n", theA);
+                    exit(1);
+                }
+                putc(theA, stdout);
+            }
+            theB = next();
+        }
+    }
+}
+
+
+/* jsmin -- Copy the input to the output, deleting the characters which are
+        insignificant to JavaScript. Comments will be removed. Tabs will be
+        replaced with spaces. Carriage returns will be replaced with linefeeds.
+        Most spaces and linefeeds will be removed.
+*/
+
+static void
+jsmin()
+{
+    theA = '\n';
+    action(3);
+    while (theA != EOF) {
+        switch (theA) {
+        case ' ':
+            if (isAlphanum(theB)) {
+                action(1);
+            } else {
+                action(2);
+            }
+            break;
+        case '\n':
+            switch (theB) {
+            case '{':
+            case '[':
+            case '(':
+            case '+':
+            case '-':
+                action(1);
+                break;
+            case ' ':
+                action(3);
+                break;
+            default:
+                if (isAlphanum(theB)) {
+                    action(1);
+                } else {
+                    action(2);
+                }
+            }
+            break;
+        default:
+            switch (theB) {
+            case ' ':
+                if (isAlphanum(theA)) {
+                    action(1);
+                    break;
+                }
+                action(3);
+                break;
+            case '\n':
+                switch (theA) {
+                case '}':
+                case ']':
+                case ')':
+                case '+':
+                case '-':
+                case '"':
+                case '\'':
+                    action(1);
+                    break;
+                default:
+                    if (isAlphanum(theA)) {
+                        action(1);
+                    } else {
+                        action(3);
+                    }
+                }
+                break;
+            default:
+                action(1);
+                break;
+            }
+        }
+    }
+}
+
+
+/* main -- Output any command line arguments as comments
+        and then minify the input.
+*/
+extern int
+main(int argc, char* argv[])
+{
+    int i;
+    for (i = 1; i < argc; i += 1) {
+        fprintf(stdout, "// %s\n", argv[i]);
+    }
+    jsmin();
+    return 0;
+}
diff --git a/tools/jsmin.py b/tools/jsmin.py
new file mode 100644
index 0000000000..8256d9735f
--- /dev/null
+++ b/tools/jsmin.py
@@ -0,0 +1,212 @@
+#!/usr/bin/python
+
+# This code is original from jsmin by Douglas Crockford, it was translated to
+# Python by Baruch Even. The original code had the following copyright and
+# license.
+#
+# /* jsmin.c
+#    2003-04-21
+# 
+# Copyright (c) 2002 Douglas Crockford  (www.crockford.com)
+# 
+# Permission is hereby granted, free of charge, to any person obtaining a copy of
+# this software and associated documentation files (the "Software"), to deal in
+# the Software without restriction, including without limitation the rights to
+# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+# of the Software, and to permit persons to whom the Software is furnished to do
+# so, subject to the following conditions:
+# 
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+# 
+# The Software shall be used for Good, not Evil.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+# */
+
+from StringIO import StringIO
+
+def jsmin(js):
+	ins = StringIO(js)
+	outs = StringIO()
+	JavascriptMinify().minify(ins, outs)
+	str = outs.getvalue()
+	if len(str) > 0 and str[0] == '\n':
+		str = str[1:]
+	return str
+
+def isAlphanum(c):
+	"""return true if the character is a letter, digit, underscore,
+           dollar sign, or non-ASCII character.
+	"""
+	return ((c >= 'a' and c <= 'z') or (c >= '0' and c <= '9') or
+	        (c >= 'A' and c <= 'Z') or c == '_' or c == '$' or c == '\\' or (c is not None and ord(c) > 126));
+
+class UnterminatedComment(Exception):
+	pass
+
+class UnterminatedStringLiteral(Exception):
+	pass
+
+class UnterminatedRegularExpression(Exception):
+	pass
+
+class JavascriptMinify(object):
+
+	def _outA(self):
+		self.outstream.write(self.theA)
+	def _outB(self):
+		self.outstream.write(self.theB)
+
+	def _get(self):
+		"""return the next character from stdin. Watch out for lookahead. If
+		   the character is a control character, translate it to a space or
+		   linefeed.
+		"""
+		c = self.theLookahead
+		self.theLookahead = None
+		if c == None:
+			c = self.instream.read(1)
+		if c >= ' ' or c == '\n':
+			return c
+		if c == '': # EOF
+			return '\000'
+		if c == '\r':
+			return '\n'
+		return ' '
+
+	def _peek(self):
+		self.theLookahead = self._get()
+		return self.theLookahead
+
+	def _next(self):
+		"""get the next character, excluding comments. peek() is used to see
+		   if a '/' is followed by a '/' or '*'.
+		"""
+		c = self._get()
+		if c == '/':
+			p = self._peek()
+			if p == '/':
+				c = self._get()
+				while c > '\n':
+					c = self._get()
+				return c
+			if p == '*':
+				c = self._get()
+				while 1:
+					c = self._get()
+					if c == '*':
+						if self._peek() == '/':
+							self._get()
+							return ' '
+					if c == '\000':
+						raise UnterminatedComment()
+
+		return c
+
+	def _action(self, action):
+		"""do something! What you do is determined by the argument:
+		   1   Output A. Copy B to A. Get the next B.
+		   2   Copy B to A. Get the next B. (Delete A).
+		   3   Get the next B. (Delete B).
+		   action treats a string as a single character. Wow!
+		   action recognizes a regular expression if it is preceded by ( or , or =.
+		"""
+		if action <= 1:
+			self._outA()
+			
+		if action <= 2:
+			self.theA = self.theB
+			if self.theA == "'" or self.theA == '"':
+				while 1:
+					self._outA()
+					self.theA = self._get()
+					if self.theA == self.theB:
+						break
+					if self.theA <= '\n':
+						raise UnterminatedStringLiteral()
+					if self.theA == '\\':
+						self._outA()
+						self.theA = self._get()
+
+
+		if action <= 3:
+			self.theB = self._next()
+			if self.theB == '/' and (self.theA == '(' or self.theA == ',' or self.theA == '='):
+				self._outA()
+				self._outB()
+				while 1:
+					self.theA = self._get()
+					if self.theA == '/':
+						break
+					elif self.theA == '\\':
+						self._outA()
+						self.theA = self._get()
+					elif self.theA <= '\n':
+						raise UnterminatedRegularExpression()
+					self._outA()
+				self.theB = self._next()
+
+
+	def _jsmin(self):
+		"""Copy the input to the output, deleting the characters which are
+		   insignificant to JavaScript. Comments will be removed. Tabs will be
+		   replaced with spaces. Carriage returns will be replaced with linefeeds.
+		   Most spaces and linefeeds will be removed.
+		"""
+		self.theA = '\n'
+		self._action(3)
+
+		while self.theA != '\000':
+			if self.theA == ' ':
+				if isAlphanum(self.theB):
+					self._action(1)
+				else:
+					self._action(2)
+			elif self.theA == '\n':
+				if self.theB in ['{', '[', '(', '+', '-']:
+					self._action(1)
+				elif self.theB == ' ':
+					self._action(3)
+				else:
+					if isAlphanum(self.theB):
+						self._action(1)
+					else:
+						self._action(2)
+			else:
+				if self.theB == ' ':
+					if isAlphanum(self.theA):
+						self._action(1)
+					else:
+						self._action(3)
+				elif self.theB == '\n':
+					if self.theA in ['}', ']', ')', '+', '-', '"', '\'']:
+						self._action(1)
+					else:
+						if isAlphanum(self.theA):
+							self._action(1)
+						else:
+							self._action(3)
+				else:
+					self._action(1)
+
+	def minify(self, instream, outstream):
+		self.instream = instream
+		self.outstream = outstream
+		self.theA = None
+		self.thaB = None
+		self.theLookahead = None
+
+		self._jsmin()
+		self.instream.close()
+
+if __name__ == '__main__':
+	import sys
+	jsm = JavascriptMinify()
+	jsm.minify(sys.stdin, sys.stdout)