--- a/ansible/roles/docker-rbweb/tasks/main.yml
+++ b/ansible/roles/docker-rbweb/tasks/main.yml
@@ -1,25 +1,32 @@
 ---
 - name: Create Review Board user
   user: name=reviewboard
 
 - name: System packages installed
-  command: /usr/bin/yum install -y memcached mod_wsgi patch
+  command: /usr/bin/yum install -y memcached mod_wsgi patch gettext
 
 # The kill-wsgi-procs support script requires psutil, which isn't part of
 # the MozReview virtualenv. Install it as a one-off
 - name: install psutil
   pip: virtualenv=/venv
        name=psutil
        version=2.2.1
 
 - name: Synchronize version-control-tools
   synchronize: src={{ vct }}/ dest=/version-control-tools/ recursive=yes delete=yes
 
+- name: Install Djblets and Review Board
+  command: /venv/bin/python setup.py install
+           chdir=/version-control-tools/reviewboard-fork/{{ item }}
+  with_items:
+    - djblets
+    - reviewboard
+
 - name: Install python libraries
   command: /venv/bin/python setup.py install chdir=/version-control-tools/pylib/{{ item }}
   with_items:
     - mozautomation
 
 - name: Build mozreview extension
   command: /venv/bin/python setup.py bdist_egg chdir=/version-control-tools/pylib/mozreview
   tags:

--- a/ansible/roles/mozreview-virtualenv/files/requirements.txt
+++ b/ansible/roles/mozreview-virtualenv/files/requirements.txt
@@ -1,15 +1,13 @@
 # Python 2.6 can't verify the x509 cert. So do straight HTTP for now.
 --trusted-host downloads.reviewboard.org
 --find-links http://downloads.reviewboard.org/releases/Django/1.6/
 --find-links http://downloads.reviewboard.org/releases/django-evolution/0.7/
---find-links http://downloads.reviewboard.org/releases/Djblets/0.9/
 --find-links http://downloads.reviewboard.org/releases/RBTools/0.7/
---find-links http://downloads.reviewboard.org/releases/ReviewBoard/2.5/
 
 amqp==1.4.8 \
     --hash=sha256:94d2a68227e7984bd40f5f71c6839730622aff8a4633f29ede1ffdd0d240795e
 
 anyjson==0.3.3 \
     --hash=sha256:37812d863c9ad3e35c0734c42e0bf0320ce8c3bed82cd20ad54cb34d158157ba
 
 argparse==1.3.0 \
@@ -25,19 +23,16 @@ django-evolution==0.7.6 \
     --hash=sha256:58285490c80698cf642ffdd15f285e538503809289c3c8b7b0bc14bbd6edf7dd
 
 django-haystack==2.3.1 \
     --hash=sha256:a30df888ee0da32c4837c328ecf859e992edb6d185efa7d49341cc1949dbb24d
 
 django-multiselectfield==0.1.3 \
     --hash=sha256:3b7e950323d477e40660d737bf79777d9122c3962a55af5bd60819e40472fc6c
 
-Djblets==0.9.3 \
-    --hash=sha256:be1f5ca56681f6feee6ec02cab9d74ffb9e1875f64e4125659b690a8f40d4e16
-
 docutils==0.12 \
     --hash=sha256:c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa
 
 ecdsa==0.13 \
     --hash=sha256:40d002cf360d0e035cf2cb985e1308d41aaa087cbfc135b2dc2d844296ea546c
 
 feedparser==5.1.3 \
     --hash=sha256:7f6507d400d07edfd1ea8205da36808009b0c539f5b8a6e0ab54337b955e6dc3 \
@@ -105,19 +100,16 @@ recaptcha-client==1.0.6 \
     --hash=sha256:28c6853c1d13d365b7dc71a6b05e5ffb56471f70a850de318af50d3d7c0dea2f
 
 pycrypto==2.6.1 \
     --hash=sha256:f2ce1e989b272cfcb677616763e0a2e7ec659effa67a88aa92b3a65528f60a3c
 
 RBTools==0.7.5 \
     --hash=sha256:28809def27e530ba5c13d37be8eb9ca31a24786cc0d0bd6d682f0009d94891a4
 
-ReviewBoard==2.5.4 \
-    --hash=sha256:342c9d89b6a5c23e381ccca2a12fb69ae7718f57d5976e47c1fcef8a925f0e99
-
 requests==2.4.3 \
     --hash=sha256:124890f41723c85aa82dfe0807432aea46d24aeb0dafce340969d2089548c2c3
 
 six==1.9.0 \
     --hash=sha256:418a93c397a7edab23e5588dbc067ac74a723edb3d541bd4936f79476e7645da
 
 Whoosh==2.6.0 \
     --hash=sha256:7de7bc4d00a6d051dbb360b48eb7f3cd002373d87252fb0b284a3c9c453a7677

--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,13 +1,11 @@
 --find-links https://downloads.reviewboard.org/releases/Django/1.6/
---find-links https://downloads.reviewboard.org/releases/Djblets/0.9/
 --find-links https://downloads.reviewboard.org/releases/django-evolution/0.7/
 --find-links https://downloads.reviewboard.org/releases/RBTools/0.6/
---find-links https://downloads.reviewboard.org/releases/ReviewBoard/2.5/
 
 -r deploy-requirements.txt
 
 alabaster==0.7.3 \
     --hash=sha256:0703c1ea5a6af0bb6d0cec24708301334949d56ebc7f95c64028d9c66f9d8d5d
 
 amqp==1.4.8 \
     --hash=sha256:94d2a68227e7984bd40f5f71c6839730622aff8a4633f29ede1ffdd0d240795e
@@ -48,19 +46,16 @@ django-haystack==2.3.1 \
     --hash=sha256:a30df888ee0da32c4837c328ecf859e992edb6d185efa7d49341cc1949dbb24d
 
 django-multiselectfield==0.1.3 \
     --hash=sha256:3b7e950323d477e40660d737bf79777d9122c3962a55af5bd60819e40472fc6c
 
 django-pipeline==1.3.27 \
     --hash=sha256:71add26f682c2e7652c43d01ab6ac1b1c693d869f663142f5f7c37b00788d162
 
-Djblets==0.9.3 \
-    --hash=sha256:be1f5ca56681f6feee6ec02cab9d74ffb9e1875f64e4125659b690a8f40d4e16
-
 docker-py==1.6.0 \
     --hash=sha256:35fef7379d5937983d645f3a15baa4874e3d512ee15f376d92131ad27c276a99
 
 docutils==0.12 \
     --hash=sha256:c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa
 
 enum34==1.1.1 \
     --hash=sha256:9d4a9220e4ebabd7ff60d853e69c3dd89debad5ddeb9ac5e768af811ece7708e
@@ -174,19 +169,16 @@ recaptcha-client==1.0.6 \
 
 requests==2.10.0 \
     --hash=sha256:09bc1b5f3a56cd8c48d433213a8cba51a67d12936568f73b5f1793fcb0c0979e \
     --hash=sha256:63f1815788157130cee16a933b2ee184038e975f0017306d723ac326b5525b54
 
 responses==0.3.0 \
     --hash=sha256:6c5eb915bcf763b677b8e51cdb68c8474127a9b60e49e6e240b05ec5e449c43b
 
-ReviewBoard==2.5.4 \
-    --hash=sha256:342c9d89b6a5c23e381ccca2a12fb69ae7718f57d5976e47c1fcef8a925f0e99
-
 selenium==2.48.0 \
     --hash=sha256:30b97338c0d9f1e60e72ecee0579b0f0845d55025342c3d5ccb224fb8a07b787
 
 six==1.10.0 \
     --hash=sha256:0ff78c403d9bccf5a425a6d31a12aa6b47f1c21ca4dc2573a7e2f32a97335eb1
 
 snowballstemmer==1.2.0 \
     --hash=sha256:6d54f350e7a0e48903a4e3b6b2cabd1b43e23765fbc975065402893692954191