diff --git a/configure.ac b/configure.ac
index a961246acc..6b3740c799 100644
--- a/configure.ac
+++ b/configure.ac
@@ -290,14 +290,14 @@ fi
 case $with_session_tracking in
     ck|none|no) ;;
     systemd)
-        PKG_CHECK_MODULES(SYSTEMD, [libsystemd-login])
+        PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login])
         ;;
     *)
 	AC_MSG_ERROR(--with-session-tracking must be one of [none, ck, systemd])
         ;;
 esac
-AC_SUBST(SYSTEMD_CFLAGS)
-AC_SUBST(SYSTEMD_LIBS)
+AC_SUBST(SYSTEMD_LOGIN_CFLAGS)
+AC_SUBST(SYSTEMD_LOGIN_LIBS)
 AC_SUBST(CKDB_PATH, /var/run/ConsoleKit/database)
 AM_CONDITIONAL(SESSION_TRACKING_CK, test "x$with_session_tracking" = "xck")
 AM_CONDITIONAL(SESSION_TRACKING_SYSTEMD, test "x$with_session_tracking" = "xsystemd")
diff --git a/src/Makefile.am b/src/Makefile.am
index bdecf87608..d4bbc9bba1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -292,7 +292,7 @@ NetworkManager_CPPFLAGS = \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) \
 	-DBINDIR=\"$(bindir)\" \
 	-DSBINDIR=\"$(sbindir)\" \
 	-DLIBEXECDIR=\"$(libexecdir)\" \
@@ -336,7 +336,7 @@ NetworkManager_LDADD = \
 	$(GUDEV_LIBS) \
 	$(LIBNL_LIBS) \
 	$(POLKIT_LIBS) \
-	$(SYSTEMD_LIBS) \
+	$(SYSTEMD_LOGIN_LIBS) \
 	$(LIBM) \
 	$(LIBDL)
 
diff --git a/src/generated/Makefile.am b/src/generated/Makefile.am
index 35e4eb6d71..8f63f3933d 100644
--- a/src/generated/Makefile.am
+++ b/src/generated/Makefile.am
@@ -67,7 +67,7 @@ libnm_generated_la_CPPFLAGS = \
 	$(GUDEV_CFLAGS) \
 	$(LIBNL_CFLAGS) \
 	$(POLKIT_CFLAGS) \
-	$(SYSTEMD_CFLAGS) \
+	$(SYSTEMD_LOGIN_CFLAGS) \
 	$(IWMX_SDK_CFLAGS)
 
 libnm_generated_la_LIBADD = \