diff --git a/jenkins/cloudbees_build b/jenkins/cloudbees_build
index 3883abf..f410830 100644
--- a/jenkins/cloudbees_build
+++ b/jenkins/cloudbees_build
@@ -4,20 +4,18 @@
 # Jenkins invokes scripts with the "-ex" option. So the build is considered a failure
 # if any of the commands exits with a non-zero exit code.
 #
-# Author: Ralph Lange <Ralph.Lange@gmx.de>
+# Author: Ralph Lange <ralph.lange@gmx.de>
 # Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# Copyright (C) 2014 ITER Organization.
+# Copyright (C) 2014-2015 ITER Organization.
 # All rights reserved. Use is subject to license terms.
 
 ###########################################
 # Determine EPICS Base version
 
-DEFAULT_BASE=3.14.12.4
+DEFAULT_BASE=3.14.12.5
 
 BASE=${1:-${DEFAULT_BASE}}
-if [ "${1}" = "${DEFAULT_BASE}" -o -z "${1}" ]; then
-    BUILD_DOCS=YES
-fi
+USE_MB=${2:-"MB_NO"}
 
 ###########################################
 # Fetch and unpack dependencies
@@ -29,14 +27,15 @@ mkdir -p ${STUFF}
 cd ${STUFF}
 
 wget -nv https://openepics.ci.cloudbees.com/job/Base-${BASE}_Build/lastSuccessfulBuild/artifact/base-${BASE}.CB-dist.tar.gz
-wget -nv https://openepics.ci.cloudbees.com/job/Doxygen-1.8.3_Build/lastSuccessfulBuild/artifact/doxygen-1.8.3.CB-dist.tar.gz
-wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_Build/BASE=${BASE}/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
-wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_Build/BASE=${BASE}/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
+wget -nv https://openepics.ci.cloudbees.com/job/pvDataCPP_Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/pvData.CB-dist.tar.gz
 tar -xzf base-${BASE}.CB-dist.tar.gz
-tar -xzf doxygen-1.8.3.CB-dist.tar.gz
-tar -xzf pvCommon.CB-dist.tar.gz
 tar -xzf pvData.CB-dist.tar.gz
 
+if [ "${USE_MB}" = "MB_YES" ]; then
+    wget -nv https://openepics.ci.cloudbees.com/job/pvCommonCPP_Build/BASE=${BASE},USE_MB=MB_YES/lastSuccessfulBuild/artifact/pvCommon.CB-dist.tar.gz
+    tar -xzf pvCommon.CB-dist.tar.gz
+fi
+
 ###########################################
 # Build
 
@@ -52,9 +51,6 @@ EPICS_BASE=${EPICS_BASE}
 EOF
 
 make distclean all
-if [ "${BUILD_DOCS}" ]; then
-    doxygen
-fi
 
 ###########################################
 # Test
@@ -65,10 +61,3 @@ make runtests
 # Create distribution
 
 tar --exclude=test* -czf normativeTypes.CB-dist.tar.gz lib include
-
-###########################################
-# Publish documentation
-
-if [ "${BUILD_DOCS}" ]; then
-    rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/normativeTypesCPP/tip
-fi
diff --git a/jenkins/cloudbees_doc b/jenkins/cloudbees_doc
new file mode 100644
index 0000000..225dd8a
--- /dev/null
+++ b/jenkins/cloudbees_doc
@@ -0,0 +1,46 @@
+# normativeTypes C++ implementation
+# Jenkins @ Cloudbees documentation generation and deployment
+#
+# Jenkins invokes scripts with the "-ex" option. So the build is considered a failure
+# if any of the commands exits with a non-zero exit code.
+#
+# Author: Ralph Lange <ralph.lange@gmx.de>
+# Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
+# Copyright (C) 2014-2015 ITER Organization.
+# All rights reserved. Use is subject to license terms.
+
+###########################################
+# Determine EPICS Base version
+
+DEFAULT_BASE=3.14.12.5
+
+BASE=${1:-${DEFAULT_BASE}}
+
+###########################################
+# Fetch and unpack dependencies
+
+export STUFF=/tmp/stuff
+
+rm -fr ${STUFF}
+mkdir -p ${STUFF}
+cd ${STUFF}
+
+wget -nv https://openepics.ci.cloudbees.com/job/Doxygen-1.8.3_Build/lastSuccessfulBuild/artifact/doxygen-1.8.3.CB-dist.tar.gz
+tar -xzf base-${BASE}.CB-dist.tar.gz
+
+###########################################
+# Generate
+
+cd ${WORKSPACE}
+
+wget -nv https://openepics.ci.cloudbees.com/job/normativeTypesCPP_Build/BASE=${BASE},USE_MB=MB_NO/lastSuccessfulBuild/artifact/normativeTypes.CB-dist.tar.gz
+tar -xzf normativeTypes.CB-dist.tar.gz
+
+export PATH=${STUFF}/bin:${PATH}
+
+doxygen
+
+###########################################
+# Publish
+
+rsync -aqP --delete -e ssh documentation epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/htdocs/docbuild/normativeTypesCPP/tip
diff --git a/jenkins/cloudbees_hgweb b/jenkins/cloudbees_hgweb
deleted file mode 100644
index a3185a8..0000000
--- a/jenkins/cloudbees_hgweb
+++ /dev/null
@@ -1,20 +0,0 @@
-# normativeTypes C++ implementation
-# Jenkins @ Cloudbees hgweb sync script
-#
-# Jenkins invokes scripts with the "-ex" option. So the build is considered a failure
-# if any of the commands exits with a non-zero exit code.
-#
-# Author: Ralph Lange <Ralph.Lange@gmx.de>
-# Copyright (C) 2013 Helmholtz-Zentrum Berlin für Materialien und Energie GmbH
-# All rights reserved. Use is subject to license terms.
-
-###########################################
-# Fetch complete repo
-
-rm -fr hgweb
-hg clone -U http://hg.code.sf.net/p/epics-pvdata/normativeTypesCPP hgweb
-
-###########################################
-# Sync into SF webspace
-
-rsync -aqP --delete --exclude=\.hg/hgrc -e ssh hgweb/.hg epics-jenkins@web.sourceforge.net:/home/project-web/epics-pvdata/repos/normativeTypesCPP