diff --git a/config.ru b/config.ru
index 5cbf4911d..9cdc2591c 100644
--- a/config.ru
+++ b/config.ru
@@ -7,5 +7,9 @@
 require ::File.expand_path('../config/environment',  __FILE__)
 #use Rack::FiberPool
 require ::File.expand_path('../lib/chrome_frame', __FILE__)
-use Rack::ChromeFrame, :minimum => 8
-run Diaspora::Application
+
+map AppConfig[:pod_uri].path  do
+  use Rack::ChromeFrame, :minimum => 8
+  use Rack::ShowExceptions
+  run Diaspora::Application
+end
diff --git a/config/initializers/sub_uri.rb b/config/initializers/sub_uri.rb
new file mode 100644
index 000000000..969147af2
--- /dev/null
+++ b/config/initializers/sub_uri.rb
@@ -0,0 +1,8 @@
+
+p = AppConfig[ :pod_uri].path
+if p and not p.empty? and p != "/"
+    Rails.application.routes.default_url_options = { :script_name => p }
+else
+    p = nil
+end
+