diff --git a/sphinx/builders/websupport.py b/sphinx/builders/websupport.py
index bc15b8c979..cdd0fb925d 100644
--- a/sphinx/builders/websupport.py
+++ b/sphinx/builders/websupport.py
@@ -107,7 +107,7 @@ class WebSupportBuilder(StandaloneHTMLBuilder):
         # if there is a source file, copy the source file for the
         # "show source" link
         if ctx.get('sourcename'):
-            source_name = path.join(self.outdir, self.app.staticdir,
+            source_name = path.join(self.app.builddir, self.app.staticdir,
                                     '_sources',  os_path(ctx['sourcename']))
             ensuredir(path.dirname(source_name))
             copyfile(self.env.doc2path(pagename), source_name)
@@ -115,9 +115,11 @@ class WebSupportBuilder(StandaloneHTMLBuilder):
     def handle_finish(self):
         StandaloneHTMLBuilder.handle_finish(self)
         shutil.move(path.join(self.outdir, '_images'),
-                    path.join(self.outdir, self.app.staticdir, '_images'))
+                    path.join(self.app.builddir, self.app.staticdir,
+                              '_images'))
         shutil.move(path.join(self.outdir, '_static'),
-                    path.join(self.outdir, self.app.staticdir, '_static'))
+                    path.join(self.app.builddir, self.app.staticdir,
+                              '_static'))
 
     def dump_search_index(self):
         self.indexer.finish_indexing()
diff --git a/sphinx/websupport/__init__.py b/sphinx/websupport/__init__.py
index 3439281353..9bd6cbda53 100644
--- a/sphinx/websupport/__init__.py
+++ b/sphinx/websupport/__init__.py
@@ -25,6 +25,7 @@ from sphinx.websupport.errors import *
 class WebSupportApp(Sphinx):
     def __init__(self, *args, **kwargs):
         self.staticdir = kwargs.pop('staticdir', None)
+        self.builddir = kwargs.pop('builddir', None)
         self.search = kwargs.pop('search', None)
         self.storage = kwargs.pop('storage', None)
         Sphinx.__init__(self, *args, **kwargs)
@@ -33,16 +34,18 @@ class WebSupport(object):
     """The main API class for the web support package. All interactions
     with the web support package should occur through this class.
     """
-    def __init__(self, srcdir='', outdir='', datadir='', search=None,
+    def __init__(self, srcdir='', builddir='', datadir='', search=None,
                  storage=None, status=sys.stdout, warning=sys.stderr,
                  moderation_callback=None, staticdir='static',
                  docroot=''):
         self.srcdir = srcdir
-        self.outdir = outdir or datadir
+        self.builddir = builddir
+        self.outdir = path.join(builddir, 'data')
+        self.datadir = datadir or self.outdir
         self.staticdir = staticdir.strip('/')
+        self.docroot = docroot.strip('/')
         self.status = status
         self.warning = warning
-        self.docroot = docroot.strip('/')
         self.moderation_callback = moderation_callback
 
         self._init_templating()
@@ -58,7 +61,7 @@ class WebSupport(object):
             from sphinx.websupport.storage.sqlalchemystorage \
                 import SQLAlchemyStorage
             from sqlalchemy import create_engine
-            db_path = path.join(self.outdir, 'db', 'websupport.db')
+            db_path = path.join(self.datadir, 'db', 'websupport.db')
             ensuredir(path.dirname(db_path))
             uri = storage or 'sqlite:///%s' % db_path
             engine = create_engine(uri)
@@ -78,7 +81,7 @@ class WebSupport(object):
             mod, cls = search_adapters[search or 'null']
             mod = 'sphinx.websupport.search.' + mod
             SearchClass = getattr(__import__(mod, None, None, [cls]), cls)
-            search_path = path.join(self.outdir, 'search')
+            search_path = path.join(self.datadir, 'search')
             self.search = SearchClass(search_path)
         self.results_template = \
             self.template_env.get_template('searchresults.html')
@@ -102,7 +105,7 @@ class WebSupport(object):
                             self.outdir, doctreedir, 'websupport',
                             search=self.search, status=self.status, 
                             warning=self.warning, storage=self.storage,
-                            staticdir=self.staticdir)
+                            staticdir=self.staticdir, builddir=self.builddir)
 
         self.storage.pre_build()
         app.build()
@@ -130,7 +133,7 @@ class WebSupport(object):
 
         :param docname: the name of the document to load.
         """
-        infilename = path.join(self.outdir, 'pickles', docname + '.fpickle')
+        infilename = path.join(self.datadir, 'pickles', docname + '.fpickle')
 
         try:
             f = open(infilename, 'rb')