diff --git a/modules/jenkins/files/slave_scripts/run-docs.sh b/modules/jenkins/files/slave_scripts/run-docs.sh
index 135eed8606..3e642f643f 100755
--- a/modules/jenkins/files/slave_scripts/run-docs.sh
+++ b/modules/jenkins/files/slave_scripts/run-docs.sh
@@ -13,15 +13,23 @@ mkdir -p doc/build
 export HUDSON_PUBLISH_DOCS=1
 tox -e$venv -- python setup.py build_sphinx
 result=$?
-if `echo $GERRIT_REFNAME | grep refs/tags/ >/dev/null` ; then
+if `echo $ZUUL_REFNAME | grep refs/tags/ >/dev/null` ; then
     # Put tagged releases in proper location. All tagged builds get copied to
     # BUILD_DIR/tagname. If this is the latest tagged release the copy of files
     # at BUILD_DIR remains. When Jenkins copies this file the root developer
     # docs are always the latest release with older tags available under the
     # root in the tagname dir.
-    TAG=`echo $GERRIT_REFNAME | sed 's/refs.tags.//'`
+    TAG=`echo $ZUUL_REFNAME | sed 's/refs.tags.//'`
     if [ ! -z $TAG ] ; then
-        LATEST=`git tag | sed -n '/^\([0-9]\+\.\?\)\+$/p' | sort -n | tail -1`
+        if echo $ZUUL_PROJECT | grep 'python-.*client' ; then
+            # This is a hack to ignore the year.release tags in python-*client
+            # projects.
+            LATEST=`git tag | sed -n -e '/^2012\..*$/d' -e '/^\([0-9]\+\.\?\)\+$/p' | sort -n | tail -1`
+        else
+            # Take all tags of the form (number.)+, sort them, then take the
+            # largest
+            LATEST=`git tag | sed -n '/^\([0-9]\+\.\?\)\+$/p' | sort -n | tail -1`
+        fi
         if [ "$TAG" = "$LATEST" ] ; then
             # Copy the docs into a subdir if this is a tagged build
             mkdir doc/build/$TAG
@@ -34,11 +42,11 @@ if `echo $GERRIT_REFNAME | grep refs/tags/ >/dev/null` ; then
             mv doc/build/$TAG doc/build/html/$TAG
         fi
     fi
-elif `echo $GERRIT_REFNAME | grep stable/ >/dev/null` ; then
+elif `echo $ZUUL_REFNAME | grep stable/ >/dev/null` ; then
     # Put stable release changes in dir named after stable release under the
     # build dir. When Jenkins copies these files they will be accessible under
     # the developer docs root using the stable release's name.
-    BRANCH=`echo $GERRIT_REFNAME | sed 's/stable.//'`
+    BRANCH=`echo $ZUUL_REFNAME | sed 's/stable.//'`
     if [ ! -z $BRANCH ] ; then
         # Move the docs into a subdir if this is a stable branch build
         mkdir doc/build/$BRANCH