diff --git a/SysBuild/tools/ConsoleKit b/SysBuild/tools/ConsoleKit
index 6b1e7a4..5f6248b 100644
--- a/SysBuild/tools/ConsoleKit
+++ b/SysBuild/tools/ConsoleKit
@@ -88,7 +88,9 @@ mk32() {
 		    --sysconfdir=/etc/sysconfig \
 		    --localstatedir=/var \
 		    --libexecdir=/usr/lib/ConsleKit \
-		    --disable-man-pages
+		    --disable-man-pages \
+		    --enable-pam-module
+	sed -i "s/\(-I\).*\(libck-connector\)/\1..\/..\/ConsoleKit-0.3.0\/\2/" pam-ck-connector/Makefile
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 	cd ../ConsoleKit*
@@ -102,21 +104,23 @@ mk() {
 	CXX="g++ $BUILDOPTIONS" \
 	USE_ARCH=$UARCH \
 	CPPFLAGS="-I/usr/X11R7/include" \
-	LDFLAGS="-L/lib64 -L/usr/lib64" \
+	LDFLAGS="-L/$LIBDIR -L/usr/$LIBDIR" \
 	../ConsoleKit*/configure --target=$TARGET \
 		    --libdir=/usr/$LIBDIR \
 		    --prefix=/usr \
 		    --sysconfdir=/etc/sysconfig \
 		    --localstatedir=/var \
 		    --libexecdir=/usr/$LIBDIR/ConsleKit  \
-		    --disable-man-pages
+		    --disable-man-pages \
+		    --enable-pam-module
+	sed -i "s/\(-I\).*\(libck-connector\)/\1..\/..\/ConsoleKit-0.3.0\/\2/" pam-ck-connector/Makefile
 	make -j $NUMCPU
 	make -j $NUMCPU DESTDIR=$TMPROOT install
 }
 
 postmk() {
+	GetSVN Viitor_ConsoleKit $TMPROOT
 	cd ../ConsoleKit*
 	rm -r ../Build-ConsoleKit
 	mv $TMPROOT/usr/share/dbus-1/system-services $TMPROOT/usr/share/dbus-1/services
-	GetSVN Viitor_ConsoleKit $TMPROOT
 }