Index: selinux-git/libselinux/utils/Makefile.am
===================================================================
--- selinux-git.orig/libselinux/utils/Makefile.am	2008-10-03 17:10:29.000000000 -0400
+++ selinux-git/libselinux/utils/Makefile.am	2008-10-03 17:26:08.000000000 -0400
@@ -16,6 +16,6 @@
 endif
 
 bin_PROGRAMS	= $(BUILDS)
-AM_LDFLAGS	= -Wl,--as-needed -lselinux -L$(builddir)/../src
-AM_CPPFLAGS	= -I$(srcdir)/../include
-BUILT_SOURCES	= $(builddir)/../src/libselinux.la
+AM_LDFLAGS	= -Wl,--as-needed -lselinux -L$(top_builddir)/src
+AM_CPPFLAGS	= -I$(top_srcdir)/include
+BUILT_SOURCES	= $(top_builddir)/src/libselinux.la
Index: selinux-git/libselinux/configure.ac
===================================================================
--- selinux-git.orig/libselinux/configure.ac	2008-10-03 17:10:29.000000000 -0400
+++ selinux-git/libselinux/configure.ac	2008-10-03 17:38:42.000000000 -0400
@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
-AC_INIT([libselinux], VERSION, selinux@tycho.nsa.gov)
+AC_INIT([libselinux], 2.0.73, selinux@tycho.nsa.gov)
 AM_INIT_AUTOMAKE
 AC_CONFIG_SRCDIR([utils/compute_create.c])
 AC_CONFIG_HEADER([config.h])
@@ -99,13 +99,6 @@
 	[]
 )
 
-if test -n "$with_python_site" ; then
-	AC_SUBST([pythondir],[$with_python_site])
-	AC_SUBST([pyexecdir],[$with_python_site])
-else
-	AC_MSG_WARN([Python site folder not specified, guessing...])
-fi
-
 AC_ARG_WITH([python],
 	[AC_HELP_STRING(
 		[--with-python=PATH],
@@ -186,6 +179,16 @@
 	_enable_swig=no
 	AC_MSG_NOTICE([Swig interface does not need to be regenerated 
 		because libpyselinux.so wrapper cannot be built])
+else
+	# Use what the user specified, otherwise fallback on autoconf
+        # internal default and display warning to user.
+        # autoconf default = libdir/pythonX.X/site-packages
+	if test -n "$with_python_site" ; then
+	        AC_SUBST([pythondir],[$with_python_site])
+	        AC_SUBST([pyexecdir],[$with_python_site])
+	else
+	        AC_MSG_WARN([Python site folder not specified, guessing...])
+	fi
 fi
 
 # slip in fake swig if needed
@@ -199,12 +202,6 @@
 		man/Makefile
 		include/Makefile])
 
-# Pickup the version info from the source directory if available
-VERSION=`cat $srcdir/VERSION`
-if test "$VERSION" = "" ; then
-	VERSION=git
-fi
-
 AC_OUTPUT
 
 PRINT='echo -n -e '
Index: selinux-git/libselinux/src/Makefile.am
===================================================================
--- selinux-git.orig/libselinux/src/Makefile.am	2008-09-30 11:43:45.000000000 -0400
+++ selinux-git/libselinux/src/Makefile.am	2008-10-03 17:43:09.000000000 -0400
@@ -9,7 +9,13 @@
 	policyvers.c freeconary.c label.c procattr.c check_context.c \
 	freecon.c label_file.c query_user_context.c compute_av.c fsetfilecon.c \
 	label_media.c compute_create.c get_context_list.c label_x.c \
-	selinux_check_securetty_context.c
+	selinux_check_securetty_context.c \
+	avc_internal.h avc_sidtab.h av_inherit.h av_perm_to_string.h \
+	callbacks.h class_to_string.h common_perm_to_string.h \
+	context_internal.h dso.h file_path_suffixes.h \
+	get_context_list_internal.h get_default_type_internal.h \
+	label_internal.h mapping.h policy.h selinux_internal.h \
+	selinux_netlink.h setrans_internal.h
 
 AVCSRC	= \
 	avc.c avc_internal.c avc_sidtab.c \
@@ -33,6 +39,7 @@
 selinux_python_PYTHON		= $(extra_py) 
 
 sysconf_DATA			= config
+CLEANFILES			= config
 config:Makefile
 	echo -e "SELINUXTYPE=$(policyname)\nSELINUX=enforcing" > $@ 
 		
Index: selinux-git/libselinux/VERSION
===================================================================
--- selinux-git.orig/libselinux/VERSION	2008-10-03 17:10:50.000000000 -0400
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-2.0.73