Index: sage/server/wiki/moin.py
===================================================================
--- sage/server/wiki/moin.py	(revision 2416)
+++ sage/server/wiki/moin.py	(revision 2438)
@@ -10,5 +10,5 @@
     except ImportError:
         print "You must install the optional moin package."
-        print "Try something like install_package('moin-1.5.4.p0'),"
+        print "Try something like install_package('moin-1.5.6'),"
         print "but note that the package name may have a different"
         print "version.  Use optional_packages() to get a list"
@@ -22,6 +22,7 @@
         return 
 
+    os.makedirs(directory)
     os.system('cp -r %s/data %s/'%(share,directory))
-    os.system('cp -r %s/underlay %s/'%(share,directory))
+    os.system('cp -r %s/underlay %s'%(share,directory))
     os.system('cp %s/config/wikiconfig.py %s/'%(share,directory))
     os.system('cp %s/server/moin.py %s/'%(share,directory))