diff --git a/docs/Makefile b/docs/Makefile
index fd967611..3eaec8f6 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,5 +1,4 @@
 # Makefile for Sphinx documentation
-
 SPHINXOPTS    =
 SPHINXBUILD   = sphinx-build2
 PAPER         =
@@ -8,14 +7,12 @@ BUILDDIR      = _build
 # Internal variables
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
 
-.PHONY: help clean html
+GH_PAGES_SOURCES = source Makefile
+GH_SOURCE_BRANCH = develop
 
-help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
+.PHONY: clean html gh-pages
 
 clean:
 	-rm -rf $(BUILDDIR)/*
@@ -24,3 +21,16 @@ html:
 	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
 	@echo
 	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+gh-pages:
+	git checkout gh-pages
+	find .. -maxdepth 1 ! -name '.git*' -and ! -name 'docs' -exec rm -rf {} \;
+	git checkout ${GH_SOURCE_BRANCH} ${GH_PAGES_SOURCES}
+	git reset HEAD
+	make html
+	mv -fv _build/html/* ..
+	rm -rf _build ${GH_PAGES_SOURCES}
+	git add ..
+	git commit -m "Create gh-pages for '`git log develop -1 --pretty=oneline --abbrev-commit`'"
+	#git push origin gh-pages
+	git checkout ${GH_SOURCE_BRANCH}
diff --git a/docs/conf.py b/docs/source/conf.py
similarity index 93%
rename from docs/conf.py
rename to docs/source/conf.py
index 64b3266d..05947c04 100644
--- a/docs/conf.py
+++ b/docs/source/conf.py
@@ -5,7 +5,6 @@ import sys, os
 sys.path.insert(0, os.path.abspath('../powerline'))
 
 extensions = ['sphinx.ext.autodoc', 'sphinx.ext.todo', 'sphinx.ext.coverage', 'sphinx.ext.viewcode']
-templates_path = ['_templates']
 source_suffix = '.rst'
 master_doc = 'index'
 project = u'Powerline'
diff --git a/docs/configuration.rst b/docs/source/configuration.rst
similarity index 100%
rename from docs/configuration.rst
rename to docs/source/configuration.rst
diff --git a/docs/configuration/vim.rst b/docs/source/configuration/vim.rst
similarity index 100%
rename from docs/configuration/vim.rst
rename to docs/source/configuration/vim.rst
diff --git a/docs/index.rst b/docs/source/index.rst
similarity index 100%
rename from docs/index.rst
rename to docs/source/index.rst
diff --git a/docs/installation.rst b/docs/source/installation.rst
similarity index 100%
rename from docs/installation.rst
rename to docs/source/installation.rst
diff --git a/docs/installation/vim.rst b/docs/source/installation/vim.rst
similarity index 100%
rename from docs/installation/vim.rst
rename to docs/source/installation/vim.rst
diff --git a/docs/introduction.rst b/docs/source/introduction.rst
similarity index 100%
rename from docs/introduction.rst
rename to docs/source/introduction.rst