Index: policykit-1-0.105/configure.ac
===================================================================
--- policykit-1-0.105.orig/configure.ac
+++ policykit-1-0.105/configure.ac
@@ -148,10 +148,11 @@ if test "x$GCC" = "xyes"; then
 fi

 dnl ---------------------------------------------------------------------------
-dnl - Select wether to use systemd or ConsoleKit for session tracking
+dnl - Select wether to use systemd, elogind or ConsoleKit for session tracking
 dnl ---------------------------------------------------------------------------

 have_systemd=no
+have_elogind=no
 SESSION_TRACKING=ConsoleKit

 AC_ARG_ENABLE([systemd],
@@ -176,10 +177,37 @@ if test "$enable_systemd" != "no"; then
   fi
 fi

+AC_ARG_ENABLE([libelogind],
+              [AS_HELP_STRING([--enable-libelogind[=@<:@auto/yes/no@:>@]], [Use libelogind (auto/yes/no)])],
+              [enable_libelogind=$enableval],
+              [enable_libelogind=auto])
+if test "$enable_libelogind" != "no"; then
+  PKG_CHECK_MODULES([LIBELOGIND],
+    [libelogind],
+    [have_libelogind=yes],
+    [have_libelogind=no])
+  if test "$have_libelogind" = "yes"; then
+    SESSION_TRACKING=libelogind
+    AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
+    save_LIBS=$LIBS
+    LIBS=$LIBELOGIND_LIBS
+    AC_CHECK_FUNCS(sd_uid_get_display)
+    LIBS=$save_LIBS
+  else
+    if test "$enable_libelogind" = "yes"; then
+      AC_MSG_ERROR([libelogind support requested but libelogind not found])
+    fi
+  fi
+fi
+
 AC_SUBST(SYSTEMD_CFLAGS)
 AC_SUBST(SYSTEMD_LIBS)
 AM_CONDITIONAL(HAVE_SYSTEMD, [test "$have_systemd" = "yes"], [Using systemd])

+AC_SUBST(LIBELOGIND_CFLAGS)
+AC_SUBST(LIBELOGIND_LIBS)
+AM_CONDITIONAL(HAVE_LIBELOGIND, [test "$have_libelogind" = "yes"], [Using libelogind])
+
 dnl ---------------------------------------------------------------------------
 dnl - Select which authentication framework to use
 dnl ---------------------------------------------------------------------------
Index: policykit-1-0.105/src/polkit/Makefile.am
===================================================================
--- policykit-1-0.105.orig/src/polkit/Makefile.am
+++ policykit-1-0.105/src/polkit/Makefile.am
@@ -85,19 +85,26 @@ if HAVE_SYSTEMD
 libpolkit_gobject_1_la_SOURCES += \
 	polkitunixsession-systemd.c		polkitunixsession.h
 else
+if HAVE_LIBELOGIND
+libpolkit_gobject_1_la_SOURCES += \
+	polkitunixsession-systemd.c		polkitunixsession.h
+else
 libpolkit_gobject_1_la_SOURCES += \
 	polkitunixsession.c			polkitunixsession.h
 endif
+endif

 libpolkit_gobject_1_la_CFLAGS =                                        	\
         -D_POLKIT_COMPILATION                                  		\
         $(GLIB_CFLAGS)							\
 	$(SYSTEMD_CFLAGS)						\
+	$(LIBELOGIND_CFLAGS)						\
         $(NULL)

 libpolkit_gobject_1_la_LIBADD =                               		\
         $(GLIB_LIBS)							\
 	$(SYSTEMD_LIBS)							\
+	$(LIBELOGIND_LIBS)						\
         $(NULL)

 libpolkit_gobject_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
Index: policykit-1-0.105/src/polkit/polkitunixsession-systemd.c
===================================================================
--- policykit-1-0.105.orig/src/polkit/polkitunixsession-systemd.c
+++ policykit-1-0.105/src/polkit/polkitunixsession-systemd.c
@@ -30,7 +30,11 @@
 #include "polkiterror.h"
 #include "polkitprivate.h"

+#ifdef HAVE_SYSTEMD
 #include <systemd/sd-login.h>
+#else
+#include <elogind/sd-login.h>
+#endif /* HAVE_SYSTEMD versus HAVE_ELOGIND */

 /**
  * SECTION:polkitunixsession
Index: policykit-1-0.105/src/polkitbackend/Makefile.am
===================================================================
--- policykit-1-0.105.orig/src/polkitbackend/Makefile.am
+++ policykit-1-0.105/src/polkitbackend/Makefile.am
@@ -47,20 +47,27 @@ if HAVE_SYSTEMD
 libpolkit_backend_1_la_SOURCES += \
 	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor-systemd.c
 else
+if HAVE_LIBELOGIND
+libpolkit_backend_1_la_SOURCES += \
+	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor-systemd.c
+else
 libpolkit_backend_1_la_SOURCES += \
 	polkitbackendsessionmonitor.h		polkitbackendsessionmonitor.c
 endif
+endif

 libpolkit_backend_1_la_CFLAGS =                                        	\
         -D_POLKIT_COMPILATION                                  		\
         -D_POLKIT_BACKEND_COMPILATION                                  	\
         $(GLIB_CFLAGS)							\
 	$(SYSTEMD_CFLAGS)						\
+	$(LIBELOGIND_CFLAGS)						\
         $(NULL)

 libpolkit_backend_1_la_LIBADD =                               		\
         $(GLIB_LIBS)							\
 	$(SYSTEMD_LIBS)							\
+	$(LIBELOGIND_LIBS)						\
 	$(top_builddir)/src/polkit/libpolkit-gobject-1.la		\
 	$(EXPAT_LIBS)							\
         $(NULL)
Index: policykit-1-0.105/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
===================================================================
--- policykit-1-0.105.orig/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
+++ policykit-1-0.105/src/polkitbackend/polkitbackendsessionmonitor-systemd.c
@@ -25,7 +25,11 @@
 #include <grp.h>
 #include <string.h>
 #include <glib/gstdio.h>
+#ifdef HAVE_SYSTEMD
 #include <systemd/sd-login.h>
+#else
+#include <elogind/sd-login.h>
+#endif /* HAVE_SYSTEMD versus HAVE_LIBELOGIND */
 #include <stdlib.h>

 #include <polkit/polkit.h>