diff --git a/.gitignore b/.gitignore
index 28652657a5..4900ef2699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 /build/ol.js
 /build/ol-compiled.js
 /build/proj4js-combined.js
+/build/apidoc
 /demos/*/advanced-optimizations.*
 /demos/*/build.html
 /demos/*/debug.html
diff --git a/Makefile b/Makefile
index a0bd9f1de6..60967b27f0 100644
--- a/Makefile
+++ b/Makefile
@@ -105,6 +105,10 @@ lint:
 $(PLOVR_JAR):
 	curl http://plovr.googlecode.com/files/$(notdir $@) > $@
 
+.PHONY: doc
+doc:
+	jsdoc -t doc/template -r src -d build/apidoc
+
 clean:
 	rm -f build/all.js
 	rm -f build/ol.js
@@ -112,6 +116,7 @@ clean:
 	rm -f demos/*/*.html
 	rm -f demos/*/advanced-optimizations.*
 	rm -f demos/*/simple-optimizations.*
+	rm -rf build/apidoc
 
 reallyclean: clean
 	rm -f $(PLOVR_JAR)