diff --git a/consolekit/.footprint b/consolekit/.footprint
index 5ee85dc88..5166111e9 100644
--- a/consolekit/.footprint
+++ b/consolekit/.footprint
@@ -1,45 +1,67 @@
+drwxr-xr-x	root/root	etc/
+drwxr-xr-x	root/root	etc/ConsoleKit/
+drwxr-xr-x	root/root	etc/ConsoleKit/run-seat.d/
+drwxr-xr-x	root/root	etc/ConsoleKit/run-session.d/
+-rwxr-xr-x	root/root	etc/ConsoleKit/run-session.d/pam-foreground-compat.ck
+drwxr-xr-x	root/root	etc/ConsoleKit/seats.d/
+-rw-r--r--	root/root	etc/ConsoleKit/seats.d/00-primary.seat
+drwxr-xr-x	root/root	etc/X11/
+drwxr-xr-x	root/root	etc/X11/xinit/
+drwxr-xr-x	root/root	etc/X11/xinit/xinitrc.d/
+-rwxr-xr-x	root/root	etc/X11/xinit/xinitrc.d/90-consolekit.sh
+drwxr-xr-x	root/root	etc/dbus-1/
+drwxr-xr-x	root/root	etc/dbus-1/system.d/
+-rw-r--r--	root/root	etc/dbus-1/system.d/ConsoleKit.conf
+drwxr-xr-x	root/root	etc/pam.d/
+-rw-r--r--	root/root	etc/pam.d/system-session
 drwxr-xr-x	root/root	lib/
+drwxr-xr-x	root/root	lib/security/
+-rwxr-xr-x	root/root	lib/security/pam_ck_connector.la
+-rwxr-xr-x	root/root	lib/security/pam_ck_connector.so
 drwxr-xr-x	root/root	lib/udev/
 drwxr-xr-x	root/root	lib/udev/rules.d/
 -rw-r--r--	root/root	lib/udev/rules.d/70-udev-acl.rules
--rwxr-xr-x	root/root	lib/udev/udev-acl
+-rw-r--r--	root/root	lib/udev/rules.d/71-udev-seat.rules
+lrwxrwxrwx	root/root	lib/udev/udev-acl -> /usr/lib/ConsoleKit/udev-acl
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ck-history
 -rwxr-xr-x	root/root	usr/bin/ck-launch-session
 -rwxr-xr-x	root/root	usr/bin/ck-list-sessions
-drwxr-xr-x	root/root	usr/etc/
-drwxr-xr-x	root/root	usr/etc/ConsoleKit/
-drwxr-xr-x	root/root	usr/etc/ConsoleKit/run-seat.d/
-drwxr-xr-x	root/root	usr/etc/ConsoleKit/run-session.d/
--rwxr-xr-x	root/root	usr/etc/ConsoleKit/run-session.d/pam-foreground-compat.ck
-drwxr-xr-x	root/root	usr/etc/ConsoleKit/seats.d/
--rw-r--r--	root/root	usr/etc/ConsoleKit/seats.d/00-primary.seat
-drwxr-xr-x	root/root	usr/etc/dbus-1/
-drwxr-xr-x	root/root	usr/etc/dbus-1/system.d/
--rw-r--r--	root/root	usr/etc/dbus-1/system.d/ConsoleKit.conf
 drwxr-xr-x	root/root	usr/include/
 drwxr-xr-x	root/root	usr/include/ConsoleKit/
 drwxr-xr-x	root/root	usr/include/ConsoleKit/ck-connector/
 -rw-r--r--	root/root	usr/include/ConsoleKit/ck-connector/ck-connector.h
+-rw-r--r--	root/root	usr/include/ConsoleKit/libconsolekit.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/
-drwxr-xr-x	root/root	usr/lib/ConsoleKit/libexec/
--rwxr-xr-x	root/root	usr/lib/ConsoleKit/libexec/ck-collect-session-info
--rwxr-xr-x	root/root	usr/lib/ConsoleKit/libexec/ck-get-x11-display-device
--rwxr-xr-x	root/root	usr/lib/ConsoleKit/libexec/ck-get-x11-server-pid
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-collect-session-info
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-get-x11-display-device
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-get-x11-server-pid
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/ck-remove-directory
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/run-seat.d/
-lrwxrwxrwx	root/root	usr/lib/ConsoleKit/run-seat.d/udev-acl.ck -> /lib/udev/udev-acl
+lrwxrwxrwx	root/root	usr/lib/ConsoleKit/run-seat.d/udev-acl.ck -> /usr/lib/ConsoleKit/udev-acl
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/run-session.d/
 drwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/ck-system-hibernate
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/ck-system-hybridsleep
 -rwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/ck-system-restart
 -rwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/ck-system-stop
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/scripts/ck-system-suspend
+-rwxr-xr-x	root/root	usr/lib/ConsoleKit/udev-acl
+drwxr-xr-x	root/root	usr/lib/girepository-1.0/
+-rw-r--r--	root/root	usr/lib/girepository-1.0/libconsolekit-1.0.typelib
 -rwxr-xr-x	root/root	usr/lib/libck-connector.la
 lrwxrwxrwx	root/root	usr/lib/libck-connector.so -> libck-connector.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libck-connector.so.0 -> libck-connector.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libck-connector.so.0.0.0
+-rwxr-xr-x	root/root	usr/lib/libconsolekit.la
+lrwxrwxrwx	root/root	usr/lib/libconsolekit.so -> libconsolekit.so.1.0.0
+lrwxrwxrwx	root/root	usr/lib/libconsolekit.so.1 -> libconsolekit.so.1.0.0
+-rwxr-xr-x	root/root	usr/lib/libconsolekit.so.1.0.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/ck-connector.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/libconsolekit.pc
 drwxr-xr-x	root/root	usr/sbin/
 -rwxr-xr-x	root/root	usr/sbin/ck-log-system-restart
 -rwxr-xr-x	root/root	usr/sbin/ck-log-system-start
@@ -53,9 +75,16 @@ drwxr-xr-x	root/root	usr/share/dbus-1/interfaces/
 -rw-r--r--	root/root	usr/share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
 drwxr-xr-x	root/root	usr/share/dbus-1/system-services/
 -rw-r--r--	root/root	usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
-drwxr-xr-x	root/root	usr/share/polkit-1/
-drwxr-xr-x	root/root	usr/share/polkit-1/actions/
--rw-r--r--	root/root	usr/share/polkit-1/actions/org.freedesktop.consolekit.policy
+drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/libconsolekit-1.0.gir
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/ck-history.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ck-launch-session.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/ck-list-sessions.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/console-kit-daemon.1m.gz
+drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/pam_ck_connector.8.gz
 drwxr-xr-x	root/root	var/
 drwxr-xr-x	root/root	var/log/
 drwxr-xr-x	root/root	var/log/ConsoleKit/
diff --git a/consolekit/.signature b/consolekit/.signature
index 324d1a1f9..8e9126844 100644
--- a/consolekit/.signature
+++ b/consolekit/.signature
@@ -1,6 +1,7 @@
 untrusted comment: verify with /etc/ports/opt.pub
-RWSE3ohX2g5d/ZCa/1XMNIzQekTwa9bxyHxgosMtNJpx3gONMh3Jr9MeArV2bz4pDOrJ4e+49yFnDVK1iZfskF2SsNDEEP34eQs=
-SHA256 (Pkgfile) = 16971edc7ada60511ed378ac25c9c07ff0c2d4c03327a98200897365a4ec7c65
-SHA256 (.footprint) = 676a8f2b04cf765092c9edf284fdd7d5352377aeb4f1b31152b2821261c13872
-SHA256 (ConsoleKit-0.4.6.tar.xz) = b41d17e06f80059589fbeefe96ad07bcc564c49e65516da1caf975146475565c
-SHA256 (pam-foreground-compat.ck) = 0b5b22641e2b138f4e9dfff9790df9fedaf2f760cc3d878ee1e94c2fd52edea9
+RWSE3ohX2g5d/eAV/JY3iFdLB8SECnEf/wcHY4x8SaxioNzRxR720zVIbbB4qqV43TxS7RXfZv0qqdcP1NE/TGZ5a+P92WRkiwU=
+SHA256 (Pkgfile) = bb89c7ad6fce435a43001c6c6d6489d7db5576e2c74582428e68a18e62a993a8
+SHA256 (.footprint) = 4f82ae4068647763cb9f461dd4ee201db0589fe0e2c7019e773cfdcc9719e4f4
+SHA256 (ConsoleKit2-1.2.1.tar.bz2) = 9af223096ece88b217bcd3fe85093390a8d1527b6492124b0e90ea7688ec934b
+SHA256 (system-session) = 599613516a16ac997a4121b4f20dd3a9c8480403614848f1aa97a0a0f1c6a236
+SHA256 (pam-foreground-compat.ck) = ca94a7640cc7c2e3bf9222b6060f01dc8f83ca3444aa430f23d08db6dcb02e34
diff --git a/consolekit/Pkgfile b/consolekit/Pkgfile
index 0c3dd04b1..04c30a254 100644
--- a/consolekit/Pkgfile
+++ b/consolekit/Pkgfile
@@ -1,28 +1,36 @@
-# Description:	Framework for defining and tracking users, login sessions, and seats
-# URL:		http://www.freedesktop.org/wiki/Software/ConsoleKit
-# Maintainer:	Alan Mizrahi, alan at mizrahi dot com dot ve
-# Depends on:	polkit dbus-glib xorg-libx11
+# Description: Framework for defining and tracking users, login sessions, and seats
+# URL:         http://www.freedesktop.org/wiki/Software/ConsoleKit
+# Maintainer:  Alan Mizrahi, alan at mizrahi dot com dot ve
+# Depends on:  linux-pam util-linux dbus glib xorg-libx11
+# Optional:    polkit
 
 name=consolekit
-version=0.4.6
-release=2
-source=(
-http://www.freedesktop.org/software/ConsoleKit/dist/ConsoleKit-0.4.6.tar.xz
-pam-foreground-compat.ck
-)
+version=1.2.1
+release=1
+source=(https://github.com/ConsoleKit2/ConsoleKit2/releases/download/$version/ConsoleKit2-$version.tar.bz2
+	system-session pam-foreground-compat.ck)
 
 build() {
-	cd ConsoleKit-$version
+	cd ConsoleKit2-$version
+
 	./configure \
 		--prefix=/usr \
+		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--libexec=/usr/lib/ConsoleKit/libexec \
-		--enable-udev-acl
+		--libexecdir=/usr/lib/ConsoleKit \
+		--with-xinitrc-dir=/etc/X11/xinit/xinitrc.d \
+		--enable-udev-acl \
+		--enable-pam-module \
+		--disable-nls
+
 	make
 	make DESTDIR=$PKG install
 
-	# This script creates /var/run/console/$USER
-	# Required by the "at_console" feature of the dbus policy system
-	# This is an alternative to pam_console
-	install -D -m 0755 -o root -g root $SRC/pam-foreground-compat.ck $PKG/usr/etc/ConsoleKit/run-session.d/pam-foreground-compat.ck
+	# http://www.linuxfromscratch.org/blfs/view/stable/postlfs/consolekit.html
+	install -D -m 0644 $SRC/system-session $PKG/etc/pam.d/system-session
+	install -m 0755 $SRC/pam-foreground-compat.ck $PKG/etc/ConsoleKit/run-session.d/
+	mv $PKG/etc/X11/xinit/xinitrc.d/90-consolekit{,.sh}
+
+	rm -r $PKG/usr/share/gtk-doc
+	rm -r $PKG/etc/logrotate.d
 }
diff --git a/consolekit/pam-foreground-compat.ck b/consolekit/pam-foreground-compat.ck
index 0697ca81b..94b68a04d 100644
--- a/consolekit/pam-foreground-compat.ck
+++ b/consolekit/pam-foreground-compat.ck
@@ -1,7 +1,9 @@
 #!/bin/sh
+
 TAGDIR=/var/run/console
 
 [ -n "$CK_SESSION_USER_UID" ] || exit 1
+[ "$CK_SESSION_IS_LOCAL" = "true" ] || exit 0
 
 TAGFILE="$TAGDIR/`getent passwd $CK_SESSION_USER_UID | cut -f 1 -d:`"
 
@@ -14,4 +16,3 @@ if [ "$1" = "session_removed" ] && [ -e "$TAGFILE" ]; then
 	sed -i "\%^$CK_SESSION_ID\$%d" "$TAGFILE"
 	[ -s "$TAGFILE" ] || rm -f "$TAGFILE"
 fi
-
diff --git a/consolekit/system-session b/consolekit/system-session
new file mode 100644
index 000000000..3825efe21
--- /dev/null
+++ b/consolekit/system-session
@@ -0,0 +1,6 @@
+# Begin ConsoleKit addition
+
+session   optional    pam_loginuid.so
+session   optional    pam_ck_connector.so nox11
+
+# End ConsoleKit addition