diff --git a/.gitignore b/.gitignore
index 4ea67d0379..eb802e8b91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,11 @@
 /bin/plovr*.jar
+/build/gh-pages
 /build/lint-spec-timestamp
 /build/lint-src-timestamp
 /build/ol.js
 /build/ol-all.js
 /build/proj4js-combined.js
 /build/require-all.js
-/build/apidoc
 /demos/*/advanced-optimizations.*
 /demos/*/build.html
 /demos/*/index.html
diff --git a/Makefile b/Makefile
index 13c244f1bc..bac9f7ff84 100644
--- a/Makefile
+++ b/Makefile
@@ -122,11 +122,11 @@ $(PLOVR_JAR):
 
 .PHONY: gh-pages
 gh-pages:
-	tools/git-update-ghpages openlayers/ol3 -i build/$(shell git rev-parse --abbrev-ref HEAD) -p $(shell git rev-parse --abbrev-ref HEAD)
+	tools/git-update-ghpages openlayers/ol3 -i build/gh-pages/$(shell git rev-parse --abbrev-ref HEAD) -p $(shell git rev-parse --abbrev-ref HEAD)
 
 .PHONY: doc
 doc:
-	$(JSDOC) -t doc/template -r src -d build/$(shell git rev-parse --abbrev-ref HEAD)/apidoc
+	$(JSDOC) -t doc/template -r src -d build/gh-pages/$(shell git rev-parse --abbrev-ref HEAD)/apidoc
 
 .PHONY: test
 test: