diff --git a/build/build.sh b/build/build.sh
index ae639489..8e64d205 100755
--- a/build/build.sh
+++ b/build/build.sh
@@ -33,8 +33,3 @@ fi
 
 ./preprocess.sh ../src/paper.js ../out/paper.js "-DBROWSER" $MODE
 ./preprocess.sh ../src/paper.js ../out/paper-server.js "-DSERVER" $MODE
-
-# Generate documentation
-# TODO: switch this on with a flag
-cd jsdoc-toolkit
-java -jar jsrun.jar app/run.js -c=conf/paperjs.conf
\ No newline at end of file
diff --git a/build/docs.sh b/build/docs.sh
new file mode 100755
index 00000000..b74f12d7
--- /dev/null
+++ b/build/docs.sh
@@ -0,0 +1,16 @@
+# Paper.js
+#
+# This file is part of Paper.js, a JavaScript Vector Graphics Library,
+# based on Scriptographer.org and designed to be largely API compatible.
+# http://scriptographer.org/
+#
+# Copyright (c) 2011, Juerg Lehni & Jonathan Puckey
+# http://lehni.org/ & http://jonathanpuckey.com/
+#
+# All rights reserved. See LICENSE file for details.
+
+# Generate documentation
+
+cd jsdoc-toolkit
+java -jar jsrun.jar app/run.js -c=conf/paperjs.conf
+cd ..