diff --git a/README.md b/README.md
index 1e722fa7..713b05f7 100644
--- a/README.md
+++ b/README.md
@@ -93,7 +93,7 @@ Contributors
 Hacking
 -------
 
-Execute `./build.rb` to effectively concatenate `main.js` with all the files in `code/`. It generates the user script which may be installed into your browser.
+Execute `./build.rb` or `./build.py` to effectively concatenate `main.js` with all the files in `code/`. It generates the user script which may be installed into your browser.
 
 `style.css` contains most styles required for the user-script. The extra ones can be found in `code/boot.js#window.setupStyles`. Only CSS rules that depend on config variables should be defined there.
 
diff --git a/build.py b/build.py
new file mode 100644
index 00000000..b690a2ed
--- /dev/null
+++ b/build.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+import glob
+import time
+
+def readfile(fn):
+    with open(fn, 'Ur') as f:
+        return f.read()
+
+c = '\n\n'.join(map(readfile, glob.glob('code/*')))
+n = time.strftime('%Y-%m-%d-%H%M%S')
+m = readfile('main.js').replace('@@BUILDDATE@@', n)
+m = m.split('@@INJECTHERE@@')
+m.insert(1, c)
+t = '\n\n'.join(m)
+
+with open('total-conversion-build.user.js', 'w') as f:
+    f.write(t)
+
+# vim: ai si ts=4 sw=4 sts=4 et
diff --git a/code/chat.js b/code/chat.js
index e1c52da5..46b4db11 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -616,7 +616,7 @@ window.chat.setupTime = function() {
   var updateTime = function() {
     if(window.isIdle()) return;
     var d = new Date();
-    inputTime.text(d.toLocaleTimeString().slice(0, 5));
+    inputTime.text(d.toISOString().slice(11, 16));
     // update ON the minute (1ms after)
     setTimeout(updateTime, (60 - d.getSeconds()) * 1000 + 1);
   };