diff --git a/addons/web/__init__.py b/addons/web/__init__.py
index 343b53d050d..5a3f33f8af4 100644
--- a/addons/web/__init__.py
+++ b/addons/web/__init__.py
@@ -1,5 +1,28 @@
 import common
 import controllers
+import common.dispatch
+
+try:
+    import openerp
+    import os
+    import tempfile
+    print "embedded mode"
+    class Options(object):
+        pass
+    o = Options()
+    o.dbfilter = '.*'
+    o.session_storage = os.path.join(tempfile.gettempdir(), "oe-sessions")
+    o.addons_path = os.path.dirname(os.path.dirname(__file__))
+    o.serve_static = True
+    o.server_host = '127.0.0.1'
+    o.server_port = 8069
+
+    app = common.dispatch.Root(o)
+    #import openerp.wsgi
+    openerp.wsgi.register_wsgi_handler(app)
+
+except ImportError:
+    print "standalone mode"
 
 # TODO
 # if we detect that we are imported from the openerp server register common.Root() as a wsgi entry point
diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py
index a6e438a75db..dd4d2071f00 100644
--- a/addons/web/__openerp__.py
+++ b/addons/web/__openerp__.py
@@ -45,4 +45,5 @@
         "static/src/css/base.css",
         "static/src/css/data_export.css",
     ],
+    'wsgi' : 'app',
 }