diff --git a/www/robots.txt b/www/robots.txt
index e65975c459..5528593348 100644
--- a/www/robots.txt
+++ b/www/robots.txt
@@ -1,2 +1,7 @@
-User-agent: Googlebot
-Disallow: /*.pdf$
+# openstack-manuals/www/robots.txt
+User-agent: Googlebot
+Disallow: /*.pdf$
+
+# Keep OpenStack users from accidentally using docs for the upcoming release
+User-agent: *
+Disallow: /trunk/