diff --git a/.htaccess b/.htaccess
index de377bfe4501e3d56ec3aa380f7f593041ca7cc4..01aa0c84a54a43a91a64e394b9f37fb70ab8f97f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1 +1,7 @@
+CheckSpelling Off
+
+RewriteEngine on
+RewriteCond %{HTTP_HOST} !=psvg.doc.ic.ac.uk
+RewriteRule ^(.*)$ http://psvg.doc.ic.ac.uk/$1 [R=301]
+
 ErrorDocument 404 /404.html
diff --git a/README.md b/README.md
index c22730efdb7c99796a69efc7698e147e2634fecb..f231c9d03b4c5b03ebdc68c603539fd3598b78a7 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ Program Specification & Verification Group Website: http://psvg.doc.ic.ac.uk/
 
 [![Dependency Status](https://gemnasium.com/bd81b2aa11ff43417700f75dbd194221.svg)](https://gemnasium.com/6ba7afbbfda9adcba06f007cc565a29a)
 
-The source code for [this site](http://psvg.doc.ic.ac.uk) is [hosted on the DoC GitLab server](https://gitlab.doc.ic.ac.uk/resource-reasoning/www-rw.doc.ic.ac.uk),
+The source code for [this site](http://psvg.doc.ic.ac.uk) is [hosted on the DoC GitLab server](https://gitlab.doc.ic.ac.uk/resource-reasoning/psvg.doc.ic.ac.uk),
 you should have access to edit it if a member of the resource-reasoning group.
 
 **DO NOT EDIT THE SOURCE CODE IN `/vol/rr/www`, IT IS ALL REPLACED EACH TIME THE SITE IS REBUILT FROM VERSION CONTROL**
diff --git a/ci/.htaccess b/ci/.htaccess
index 66a8d068ffc8a93e615f023c219e5533e06a90ae..d7b08b22e4d636bb57da0343995f67509e55fb5b 100644
--- a/ci/.htaccess
+++ b/ci/.htaccess
@@ -15,8 +15,9 @@ RewriteBase /ci/
 RewriteRule ^([^/]+)$ $1/ [R,L]
 
 # Force to HTTPS
-RewriteCond %{HTTPS} =off
-RewriteRule ^(.*)$ https://www-rw.doc.ic.ac.uk/ci/$1 [R=301,L]
+RewriteCond %{HTTPS} =off [OR]
+RewriteCond %{HTTP_HOST} !=psvg.doc.ic.ac.uk
+RewriteRule ^(.*)$ https://psvg.doc.ic.ac.uk/ci/$1 [R=301,L]
 
 # Proxy through to the internal server
 RewriteRule ^(.*)$ https://146.169.46.217/ci/$1 [P]