2 files changed, 4 insertions, 4 deletions
diff --git a/source4/setup/provision b/source4/setup/provision
index 2579bc4f19..c1d6cd157a 100755
--- a/source4/setup/provision
+++ b/source4/setup/provision
@@ -30,10 +30,10 @@ import os, sys
 sys.path.insert(0, "bin/python")
 
 import samba
-import param
 
-from auth import system_session
+from samba.auth import system_session
 import samba.getopt as options
+from samba import param
 from samba.provision import (provision, 
                              FILL_FULL, FILL_NT4SYNC,
                              FILL_DRS)
diff --git a/source4/setup/upgrade b/source4/setup/upgrade
index b1d9ffa37c..03c6747d4e 100755
--- a/source4/setup/upgrade
+++ b/source4/setup/upgrade
@@ -11,10 +11,10 @@ import os, sys
 # Find right directory when running from source tree
 sys.path.insert(0, "bin/python")
 
-import param
 import samba
 import samba.getopt as options
-from auth import system_session
+from samba import param
+from samba.auth import system_session
 
 parser = optparse.OptionParser("upgrade [options] <libdir> <smbconf>")
 sambaopts = options.SambaOptions(parser)