diff --git a/doc/conf.py b/doc/conf.py
index 151b6d185..3abe48e09 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,10 +11,10 @@
 # All configuration values have a default value; values that are commented out
 # serve to show the default value.
 
-import sys
+import sys, os
 
 # If your extensions are in another directory, add it here.
-sys.path.append('.')
+sys.path.append(os.path.dirname(__file__))
 
 # General configuration
 # ---------------------
diff --git a/sphinx/builder.py b/sphinx/builder.py
index 0ca86c850..99bd3333a 100644
--- a/sphinx/builder.py
+++ b/sphinx/builder.py
@@ -448,7 +448,8 @@ class StandaloneHTMLBuilder(Builder):
         self.info(bold('copying static files...'))
         ensuredir(path.join(self.outdir, 'static'))
         staticdirnames = [path.join(path.dirname(__file__), 'static')] + \
-                         self.config.html_static_path
+                         [path.join(self.srcdir, spath)
+                          for spath in self.config.html_static_path]
         for staticdirname in staticdirnames:
             for filename in os.listdir(staticdirname):
                 if not filename.startswith('.'):
diff --git a/sphinx/config.py b/sphinx/config.py
index e544052ab..d1b31805e 100644
--- a/sphinx/config.py
+++ b/sphinx/config.py
@@ -68,11 +68,11 @@ class Config(object):
 
     def __init__(self, dirname, filename):
         self.values = self.config_values.copy()
-        config = {}
+        config = {'__file__': path.join(dirname, filename)}
         olddir = os.getcwd()
         try:
             os.chdir(dirname)
-            execfile(path.join(dirname, filename), config)
+            execfile(config['__file__'], config)
         finally:
             os.chdir(olddir)
         # remove potentially pickling-problematic values