diff --git a/tox.ini b/tox.ini
index 0a172d2df2..03e833a9f1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -7,7 +7,11 @@ skipsdist = True
 setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/test-requirements.txt
-whitelist_externals = bash
+whitelist_externals =
+  bash
+  cp
+  mkdir
+  sed
 
 [testenv:venv]
 commands = {posargs}
@@ -31,7 +35,15 @@ commands = openstack-doc-test --check-build {posargs}
 # Prepare all documents (except www subdir) so that they can get
 # published on docs.openstack.org with just copying publish-docs/*
 # over.
-commands = openstack-doc-test --check-build --nocreate-index --force
+commands = 
+  openstack-doc-test --check-build --nocreate-index --force
+  # Publish install-guide and config-reference to /icehouse
+  # TODO(jaegerandi): Remove these lines before we branch off an
+  # icehouse branch.
+  cp -a publish-docs/trunk publish-docs/icehouse
+  # Replace links to /trunk with links to /icehouse/
+  # This needs bash so that tox does not interpret the *
+  bash -c "sed -i -e 's|/trunk/|/icehouse/|g' publish-docs/icehouse/*/atom.xml publish-docs/icehouse/*/*/*/atom.xml publish-docs/icehouse/*/*.html publish-docs/icehouse/*/*/*/*/*.html publish-docs/icehouse/*/*/*/*.html publish-docs/icehouse/*/*/*.html publish-docs/icehouse/*/*.html"
 
 [testenv:buildlang-install]
 # Run as "tox -e buildlang-install -- $LANG"