--- a/configure.ac	2016-11-07 21:13:53.597490685 +0100
+++ b/configure.ac	2016-11-07 21:16:44.890489421 +0100
@@ -286,6 +286,10 @@
 msg_libsystemd_login=no
 LIBSYSTEMD_LOGIN_REQUIRED=44
 
+if test "x$enable_libelogind" != "xno"; then
+  enable_libsystemd_login=no
+fi
+
 if test "x$enable_libsystemd_login" != "xno"; then
   PKG_CHECK_EXISTS([libsystemd], [msg_libsystemd_login=yes],
                    [PKG_CHECK_EXISTS([libsystemd-login >= $LIBSYSTEMD_LOGIN_REQUIRED], [msg_libsystemd_login=yes])])
@@ -299,6 +303,25 @@
 
 AM_CONDITIONAL(USE_LIBSYSTEMD_LOGIN, [test "$msg_libsystemd_login" = "yes"])
 
+dnl **********************************
+dnl *** Check for libelogind       ***
+dnl **********************************
+
+AC_ARG_ENABLE([libelogind], [AS_HELP_STRING([--enable-libelogind],[build with libelogind instead of libsystemd-login])])
+msg_libelogind=no
+LIBELOGIND_REQUIRED=218
+
+if test "x$enable_libelogind" != "xno"; then
+  PKG_CHECK_EXISTS([libelogind >= $LIBELOGIND_REQUIRED], [msg_libelogind=yes])
+
+  if test "x$msg_libelogind" = "xyes"; then
+    PKG_CHECK_MODULES([LIBELOGIND],[libelogind >= $LIBELOGIND_REQUIRED])
+    AC_DEFINE([HAVE_LIBELOGIND], 1, [Define to 1 if libelogind is available])
+  fi
+fi
+
+AM_CONDITIONAL(USE_LIBELOGIND, [test "$msg_libelogind" = "yes"])
+
 dnl **********************
 dnl *** Check for HAL ***
 dnl **********************
@@ -969,6 +992,7 @@
 	Build GOA volume monitor:     $msg_goa
         Use systemd user units:       $msg_systemd_user_units
         Use libsystemd-login:         $msg_libsystemd_login
+        Use libelogind:               $msg_libelogind
         Use GCR:                      $msg_gcr
 	GNOME Keyring support:        $msg_keyring
 	GTK+ support:                 $msg_gtk
--- a/monitor/udisks2/Makefile.am	2016-11-07 21:18:13.335488769 +0100
+++ b/monitor/udisks2/Makefile.am	2016-11-07 21:19:21.703488264 +0100
@@ -20,6 +20,7 @@
 	$(UDISKS2_CFLAGS)                       \
 	$(GUDEV_CFLAGS)                         \
 	$(LIBSYSTEMD_LOGIN_CFLAGS)		\
+	$(LIBELOGIND_CFLAGS)			\
 	$(KEYRING_CFLAGS)			\
 	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	\
 	-DGVFS_LOCALEDIR=\""$(localedir)"\"	\
@@ -35,6 +36,7 @@
 	$(UDISKS2_LIBS)                                  			\
 	$(GUDEV_LIBS)                                  			      	\
 	$(LIBSYSTEMD_LOGIN_LIBS)						\
+	$(LIBELOGIND_LIBS)							\
 	$(KEYRING_LIBS)								\
 	$(top_builddir)/common/libgvfscommon.la 			      	\
 	$(top_builddir)/common/libgvfscommon-monitor.la			      	\
--- a/monitor/udisks2/gvfsudisks2utils.c	2016-11-07 17:32:11.191477888 +0100
+++ b/monitor/udisks2/gvfsudisks2utils.c	2016-11-07 17:33:41.459477222 +0100
@@ -532,7 +532,13 @@
 
 #if defined(HAVE_LIBSYSTEMD_LOGIN)
 #include <systemd/sd-login.h>
+#endif
 
+#if defined(HAVE_LIBELOGIND)
+#include <elogind/sd-login.h>
+#endif
+
+#if defined(HAVE_LIBSYSTEMD_LOGIN) || defined(HAVE_LIBELOGIND)
 static const gchar *
 get_seat (void)
 {