diff -p -up sage-4.4/sage/server/wiki/moin.py.orig sage-4.4/sage/server/wiki/moin.py
--- sage-4.4/spkg/build/sage-4.4/sage/server/wiki/moin.py.orig	2010-04-28 17:44:18.768196814 -0300
+++ sage-4.4/spkg/build/sage-4.4/sage/server/wiki/moin.py	2010-04-28 17:44:34.319195681 -0300
@@ -24,7 +24,7 @@ from sage.server.misc import print_open_
 
 join = os.path.join
 
-def wiki_create_instance(directory='sage_wiki'):
+def wiki_create_instance(directory=('%s/sage_wiki'%misc.DOT_SAGE)):
     """
     Creates a new MoinMoin wiki.  This is a modified version of
     MoinMoin with jsMath typesetting preconfigured.
@@ -35,6 +35,7 @@ def wiki_create_instance(directory='sage
         to use for the new wiki.
     """
     share = os.path.join(misc.SAGE_LOCAL, 'share', 'moin')
+    PYTHONPATH = os.environ["PYTHONPATH"]
 
     directory = os.path.abspath(directory)
 
@@ -47,7 +48,7 @@ def wiki_create_instance(directory='sage
     shutil.copytree(join(share, 'data'), join(directory, 'data'))
     shutil.copytree(join(share, 'underlay'), join(directory, 'underlay'))
     shutil.copytree(join(share, 'server'), join(directory, 'server'))
-    shutil.copyfile(join(share, 'config', 'wikiconfig.py'),
+    shutil.copyfile(join(PYTHONPATH, 'wikiconfig.py'),
                     join(directory, 'wikiconfig.py'))
 
     wsgi_conf_name = join(directory, 'server', 'moin.wsgi')
@@ -63,13 +64,13 @@ def wiki_create_instance(directory='sage
     wsgi_conf_fd.close()
 
     os.makedirs(join(directory, 'twisted', 'plugins'))
-    shutil.copyfile(join(directory, 'server', 'mointwisted.py'),
+    shutil.copyfile(join(PYTHONPATH, 'mointwisted.py'),
                    join(directory, 'twisted', 'plugins',
                         'mointwisted_plugin.py'))
 
     shutil.copyfile(wsgi_conf_name, join(directory, 'moin.py'))
 
-def wiki(directory='sage_wiki',
+def wiki(directory=('%s/sage_wiki'%misc.DOT_SAGE),
          port=9000,
          address='localhost',
          fork=False):