diff --git a/.gitignore b/.gitignore
index 8c960ec8..6b2ea0ab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+docs/build/
+docs/site/
diff --git a/.travis.yml b/.travis.yml
index ac6d196c..2a9a22ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,6 +9,9 @@ notifications:
   email: false
 # uncomment the following lines to override the default test script
 script:
- - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
- - julia -e 'Pkg.clone("https://github.com/MikeInnes/DataFlow.jl")'
- - julia -e 'Pkg.clone(pwd()); Pkg.build("Flux"); Pkg.test("Flux"; coverage=true)'
+  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
+  - julia -e 'Pkg.clone("https://github.com/MikeInnes/DataFlow.jl")'
+  - julia -e 'Pkg.clone(pwd()); Pkg.build("Flux"); Pkg.test("Flux"; coverage=true)'
+# after_success:
+  - julia -e 'Pkg.add("Documenter")'
+  - julia -e 'cd(Pkg.dir("Flux")); include(joinpath("docs", "make.jl"))'
diff --git a/docs/make.jl b/docs/make.jl
new file mode 100644
index 00000000..9ef67abd
--- /dev/null
+++ b/docs/make.jl
@@ -0,0 +1,17 @@
+using Documenter, Flux
+
+makedocs(modules=Module[Flux],
+         doctest=false, clean=true,
+         format = :html,
+         sitename="Flux Documentation",
+         pages = [
+           "Home" => "index.md",
+         ])
+
+deploydocs(
+   repo = "github.com/MikeInnes/Flux.jl.git",
+   target = "build",
+   osname = "linux",
+   julia = "0.5",
+   deps = nothing,
+   make = nothing)
diff --git a/docs/src/index.md b/docs/src/index.md
new file mode 100644
index 00000000..23a30b30
--- /dev/null
+++ b/docs/src/index.md
@@ -0,0 +1 @@
+# Flux