diff --git a/Makefile b/Makefile
index c32a393..7d2530c 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ push-gh-pages: build-gh-pages
 	git push origin gh-pages:gh-pages
 
 # build site and push to reagent-project's doc site
-push-project-docs: gen-site
+push-project-docs: gen-site gen-docs
         # sanity check
 	test -f $(SITEDIR)/index.html
 	test ! -e $(OUTPUTDIR)
@@ -78,6 +78,8 @@ push-project-docs: gen-site
 	git clone git@github.com:reagent-project/reagent-project.github.io.git tmp
 	rm -fr tmp/*
 	cp -r $(SITEDIR)/* tmp/
+	mkdir -p tmp/docs/master/
+	cp -r target/doc/* tmp/docs/master/
 	cd tmp && \
 	git add . && git commit -m "Updated" && \
 	git push
@@ -90,6 +92,9 @@ gen-site: clean
 	lein with-profile prod cljsbuild once
 	lein with-profile prerender cljsbuild once
 
+gen-docs: clean
+	lein codox
+
 # copy contents of $(SITEDIR) to branch gh-pages
 gh-pages-add:
         # sanity check
diff --git a/README.md b/README.md
index d008902..997d830 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@ Reagent provides a way to write efficient React components using (almost) nothin
   * **[Detailed intro with live examples](http://reagent-project.github.io/)**
   * **[News](http://reagent-project.github.io/news/index.html)**
   * **[Reagent Project Mailing List](https://groups.google.com/forum/#!forum/reagent-project)**
-  * **[API Documentation](http://blog.ducky.io/reagent-docs/index.html)**
+  * **[API Documentation](http://reagent-project.github.io/docs/master/)**
 
 ### Prerequisites
 
diff --git a/demo/reagentdemo/core.cljs b/demo/reagentdemo/core.cljs
index f9a654a..0396545 100644
--- a/demo/reagentdemo/core.cljs
+++ b/demo/reagentdemo/core.cljs
@@ -31,7 +31,7 @@
     [:li [link {:href index-page} "Intro"]]
     [:li [link {:href news/url} "News"]]
     [:li>a github "GitHub"]
-    [:li [link {:href "http://blog.ducky.io/reagent-docs/index.html"} "API"]]]
+    [:li [:a {:href "http://reagent-project.github.io/docs/master/"} "API"]]]
    [:div @test-results]
    [tools/main-content]
    [github-badge]])
diff --git a/project.clj b/project.clj
index 6cdb3cd..200407c 100644
--- a/project.clj
+++ b/project.clj
@@ -9,12 +9,13 @@
                  [cljsjs/react-dom-server "15.4.2-2"]]
 
   :plugins [[lein-cljsbuild "1.1.5"]
-            [codox "0.9.0"]]
+            [lein-codox "0.10.3"]]
 
   :source-paths ["src"]
 
   :codox {:language :clojurescript
-          :exclude clojure.string}
+          :exclude clojure.string
+          :source-paths ["src"]}
 
   :profiles {:test {:cljsbuild
                     {:builds {:client {:source-paths ["test"]