diff --git a/Makefile b/Makefile
index bc133dc..8a8daf9 100644
--- a/Makefile
+++ b/Makefile
@@ -22,13 +22,13 @@ FFMPEG_CFLAGS += $(shell pkg-config --cflags libswresample)
 FFMPEG_LIBS += $(shell pkg-config --libs libswresample)
 
 CMUS_LIBS = $(PTHREAD_LIBS) $(NCURSES_LIBS) $(ICONV_LIBS) $(DL_LIBS) $(DISCID_LIBS) \
-			-lm $(COMPAT_LIBS) $(LIBSYSTEMD_LIBS)
+			-lm $(COMPAT_LIBS) $(LOGIND_LIBS)
 
 input.o main.o ui_curses.o op/pulse.lo: .version
 input.o main.o ui_curses.o op/pulse.lo: CFLAGS += -DVERSION=\"$(VERSION)\"
 main.o server.o: CFLAGS += -DDEFAULT_PORT=3000
 discid.o: CFLAGS += $(DISCID_CFLAGS)
-mpris.o: CFLAGS += $(LIBSYSTEMD_CFLAGS)
+mpris.o: CFLAGS += $(LOGIND_CFLAGS)
 
 .version: Makefile
 	@test "`cat $@ 2> /dev/null`" = "$(VERSION)" && exit 0; \
diff --git a/configure b/configure
index 44eec64..9591925 100755
--- a/configure
+++ b/configure
@@ -246,9 +246,9 @@ check_vorbis()
 	fi
 }
 
-check_libsystemd()
+check_logind()
 {
-	pkg_config LIBSYSTEMD "libsystemd"
+	pkg_config LOGIND "libsystemd" || pkg_config LOGIND "libelogind >= 239.3"
 	return $?
 }
 
@@ -536,7 +536,7 @@ check check_modplug    CONFIG_MODPLUG
 check check_mpc        CONFIG_MPC
 check check_vorbis     CONFIG_VORBIS
 check check_opus       CONFIG_OPUS
-check check_libsystemd CONFIG_MPRIS
+check check_logind     CONFIG_MPRIS
 check check_wavpack    CONFIG_WAVPACK
 check check_mp4        CONFIG_MP4
 check check_aac        CONFIG_AAC