diff -urN portage.orig/__init__.py portage/__init__.py
--- portage.orig/__init__.py	2008-09-22 15:18:03.000000000 -0400
+++ portage/__init__.py	2008-09-22 16:07:30.000000000 -0400
@@ -139,7 +139,7 @@
 
 
 try:
-	import portage.selinux as selinux
+	import portage._selinux as selinux
 except OSError, e:
 	writemsg("!!! SELinux not loaded: %s\n" % str(e), noiselevel=-1)
 	del e
diff -urN portage.orig/_selinux.py portage/_selinux.py
--- portage.orig/_selinux.py	1969-12-31 19:00:00.000000000 -0500
+++ portage/_selinux.py	2008-08-20 12:11:17.000000000 -0400
@@ -0,0 +1,8 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+import selinux
+from selinux import is_selinux_enabled
+from selinux_aux import setexec, secure_symlink, secure_rename, \
+	secure_copy, secure_mkdir, getcontext, get_sid, get_lsid
diff -urN portage.orig/selinux.py portage/selinux.py
--- portage.orig/selinux.py	2008-08-20 12:11:17.000000000 -0400
+++ portage/selinux.py	1969-12-31 19:00:00.000000000 -0500
@@ -1,8 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-import selinux
-from selinux import is_selinux_enabled
-from selinux_aux import setexec, secure_symlink, secure_rename, \
-	secure_copy, secure_mkdir, getcontext, get_sid, get_lsid