diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index c704fd164e..d2d71830b0 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -56,3 +56,7 @@ AWS_SECRET_ACCESS_KEY = AUTH_TOKENS["AWS_SECRET_ACCESS_KEY"]
 DATABASES = AUTH_TOKENS['DATABASES']
 
 XQUEUE_INTERFACE = AUTH_TOKENS['XQUEUE_INTERFACE']
+
+if 'COURSE_ID' in ENV_TOKENS:
+    ASKBOT_URL = "courses/{0}/discussions/".format(ENV_TOKENS['COURSE_ID'])
+
diff --git a/proxy/nginx.conf b/proxy/nginx.conf
index 470c3933ac..2b48e17d03 100644
--- a/proxy/nginx.conf
+++ b/proxy/nginx.conf
@@ -61,6 +61,11 @@ http {
       location /courses/MITx/6.002x/2012_Fall/ {
         proxy_pass http://course_mitx_6002_2012_fall;
       }
+
+      location ~ /courses/([^/]*)/([^/]*)/([^/]*)/(course_wiki|wiki) {
+        proxy_pass http://portal;
+      }
+
     }
 }