diff --git a/tools/copy-to-branch.sh b/tools/copy-to-branch.sh
new file mode 100755
index 0000000000..81df82a44d
--- /dev/null
+++ b/tools/copy-to-branch.sh
@@ -0,0 +1,36 @@
+#!/bin/bash -xe
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#
+# Copy files from trunk to named branch and replace all links from
+# trunk with links to the branch
+
+BRANCH=$1
+
+if [ -z "$BRANCH" ] ; then
+    echo "usage $0 BRANCH"
+    exit 1
+fi
+
+if [ -e publish-docs/trunk ] ; then
+
+    # Copy files over
+    cp -a publish-docs/trunk publish-docs/$BRANCH
+
+    for f in $(find publish-docs/$BRANCH -name "atom.xml") ; do
+        sed -i -e "s|/trunk/|/$BRANCH/|g" $f
+    done
+    for f in $(find publish-docs/$BRANCH -name "*.html") ; do
+        sed -i -e "s|/trunk/|/$BRANCH/|g" $f
+    done
+fi
diff --git a/tox.ini b/tox.ini
index 03d5fc9f16..51f0b3085b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -58,10 +58,7 @@ commands =
   # TODO(jaegerandi): Remove the following lines before we branch off
   # an juno branch.
   # Publish install-guide and config-reference to /juno
-  cp -a publish-docs/trunk publish-docs/juno
-  # Replace links to /trunk with links to /juno/
-  # This needs bash so that tox does not interpret the *
-  bash -c "sed -i -e 's|/trunk/|/juno/|g' publish-docs/juno/*/atom.xml publish-docs/juno/*/*/*/atom.xml publish-docs/juno/*/*.html publish-docs/juno/*/*/*/*/*.html publish-docs/juno/*/*/*/*.html publish-docs/juno/*/*/*.html publish-docs/juno/*/*.html"
+  bash tools/copy-to-branch.sh juno
   # END Juno duplication.
   # Now publish www as well, we cannot do this from
   # openstack-doc-test. Use rsync so that .htaccess gets also