diff --git a/.travis/setup.sh b/.travis/setup.sh
index 53ba7430..6b564556 100755
--- a/.travis/setup.sh
+++ b/.travis/setup.sh
@@ -4,10 +4,6 @@
 
 if [[ $TRAVIS_BRANCH == 'master' ]] ; then
     export DEPLOY_HTML_DIR=docs
-elif [[ $TRAVIS_BRANCH == 'develop' ]] ; then
-    export DEPLOY_HTML_DIR=docs/develop
-elif [[ $TRAVIS_BRANCH =~ ^v[0-9.]+$ ]]; then
-    export DEPLOY_HTML_DIR=docs/${TRAVIS_BRANCH:1}
 else
     export DEPLOY_HTML_DIR=docs/$TRAVIS_BRANCH
 fi
diff --git a/docs/conf.py b/docs/conf.py
index da8e84ab..9e629019 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.5'
+version = 'v0.5'
 # The full version, including alpha/beta/rc tags.
-release = '0.5.0-b2-@'
+release = 'v0.5.0-b2-@'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.