diff -p -up sage-4.4/doc/common/conf.py.orig sage-4.4/doc/common/conf.py
--- sage-4.4/spkg/build/sage-4.4/doc/common/conf.py.orig	2010-04-15 02:37:37.000000000 -0300
+++ sage-4.4/spkg/build/sage-4.4/doc/common/conf.py	2010-04-28 17:51:12.889193141 -0300
@@ -1,6 +1,6 @@
 import sys, os, re
-SAGE_ROOT = os.environ['SAGE_ROOT']
-SAGE_DOC = os.path.join(SAGE_ROOT, 'devel/sage/doc')
+SAGE_DEVEL = os.environ['SAGE_DEVEL']
+SAGE_DOC = os.environ['SAGE_DOC']
 
 # If your extensions are in another directory, add it here. If the directory
 # is relative to the documentation root, use os.path.abspath to make it
@@ -143,9 +143,7 @@ html_static_path = [os.path.join(SAGE_DO
 # array.  We can override / overwrite selected files by putting them
 # in the remaining paths.
 if 'SAGE_DOC_JSMATH' in os.environ:
-    from pkg_resources import Requirement, working_set
-    sagenb_path = working_set.find(Requirement.parse('sagenb')).location
-    jsmath_static = os.path.join(sagenb_path, 'sagenb', 'data', 'jsmath')
+    jsmath_static = os.path.join(SAGE_DEVEL, 'sagenb', 'data', 'javascript', 'jsmath')
     html_static_path.insert(0, jsmath_static)
 
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
diff -p -up sage-4.4/sage/misc/sagedoc.py.orig sage-4.4/sage/misc/sagedoc.py
--- sage-4.4/spkg/build/sage-4.4/sage/misc/sagedoc.py.orig	2010-04-16 01:50:28.000000000 -0300
+++ sage-4.4/spkg/build/sage-4.4/sage/misc/sagedoc.py	2010-04-28 17:51:12.892200137 -0300
@@ -541,12 +541,12 @@ def _search_src_or_doc(what, string, ext
         module = ''
         exts = ['html']
         title = 'Documentation'
-        base_path = os.path.join('devel', 'sage', 'doc', 'output')
+        base_path = os.path.join('doc', 'output')
 
         # check if any documentation is missing.  first read the start
         # of SAGE_ROOT/devel/sage/doc/common/builder.py to find list
         # of languages, documents, and documents to omit
-        doc_path = os.path.join(ROOT, 'devel', 'sage', 'doc')
+        doc_path = os.path.join(ROOT, 'devel', 'doc')
         builder = open(os.path.join(doc_path, 'common', 'builder.py'))
         s = builder.read()[:1000]
         builder.close()