diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -20,11 +20,11 @@
 
 **BUG REPORTS**
 
-Please update your install to **HEAD** before filing bug reports. Follow our [bug reporting guide](https://secure.phabricator.com/book/phabcontrib/article/bug_reports/) for complete instructions.
+Please update your install to **HEAD** before filing bug reports. Follow our [bug reporting guide](https://secure.phabricator.com/diviner/book/phabcontrib/article/bug_reports/) for complete instructions.
 
 **FEATURE REQUESTS**
 
-We're big fans of feature requests that state core problems, not just 'add this'. We've compiled a short guide to effective upstream requests [here](https://secure.phabricator.com/book/phabcontrib/article/feature_requests/).
+We're big fans of feature requests that state core problems, not just 'add this'. We've compiled a short guide to effective upstream requests [here](https://secure.phabricator.com/diviner/book/phabcontrib/article/feature_requests/).
 
 **COMMUNITY CHAT**
 
@@ -36,7 +36,7 @@
 
 **PULL REQUESTS**
 
-We do not accept pull requests through GitHub. If you would like to contribute code, please read our [Contributor's Guide](https://secure.phabricator.com/book/phabcontrib/article/contributing_code/) for more information.
+We do not accept pull requests through GitHub. If you would like to contribute code, please read our [Contributor's Guide](https://secure.phabricator.com/diviner/book/phabcontrib/article/contributing_code/) for more information.
 
 **LICENSE**
 
diff --git a/src/applications/diviner/application/PhabricatorDivinerApplication.php b/src/applications/diviner/application/PhabricatorDivinerApplication.php
--- a/src/applications/diviner/application/PhabricatorDivinerApplication.php
+++ b/src/applications/diviner/application/PhabricatorDivinerApplication.php
@@ -37,14 +37,15 @@
         '' => 'DivinerMainController',
         'query/((?<key>[^/]+)/)?' => 'DivinerAtomListController',
         'find/' => 'DivinerFindController',
-      ),
-      '/book/(?P<book>[^/]+)/' => 'DivinerBookController',
-      '/book/'.
-        '(?P<book>[^/]+)/'.
-        '(?P<type>[^/]+)/'.
-        '(?:(?P<context>[^/]+)/)?'.
-        '(?P<name>[^/]+)/'.
-        '(?:(?P<index>\d+)/)?' => 'DivinerAtomController',
+
+        'book/(?P<book>[^/]+)/' => 'DivinerBookController',
+        'book/'.
+          '(?P<book>[^/]+)/'.
+          '(?P<type>[^/]+)/'.
+          '(?:(?P<context>[^/]+)/)?'.
+          '(?P<name>[^/]+)/'.
+          '(?:(?P<index>\d+)/)?' => 'DivinerAtomController',
+        ),
     );
   }
 
diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php
--- a/src/applications/diviner/controller/DivinerAtomController.php
+++ b/src/applications/diviner/controller/DivinerAtomController.php
@@ -62,7 +62,7 @@
 
     $crumbs->addTextCrumb(
       $book->getShortTitle(),
-      '/book/'.$book->getName().'/');
+      '/diviner/book/'.$book->getName().'/');
 
     $atom_short_title = $atom->getDocblockMetaValue(
       'short',
diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php
--- a/src/applications/diviner/controller/DivinerBookController.php
+++ b/src/applications/diviner/controller/DivinerBookController.php
@@ -30,7 +30,7 @@
 
     $crumbs->addTextCrumb(
       $book->getShortTitle(),
-      '/book/'.$book->getName().'/');
+      '/diviner/book/'.$book->getName().'/');
 
     $header = id(new PHUIHeaderView())
       ->setHeader($book->getTitle())
diff --git a/src/applications/diviner/controller/DivinerMainController.php b/src/applications/diviner/controller/DivinerMainController.php
--- a/src/applications/diviner/controller/DivinerMainController.php
+++ b/src/applications/diviner/controller/DivinerMainController.php
@@ -42,7 +42,7 @@
       foreach ($books as $book) {
         $item = id(new DivinerBookItemView())
           ->setTitle($book->getTitle())
-          ->setHref('/book/'.$book->getName().'/')
+          ->setHref('/diviner/book/'.$book->getName().'/')
           ->setSubtitle($book->getPreface());
         $list[] = $item;
       }