diff --git a/configure.ac b/configure.ac
index e9f559b..68356d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,7 +108,7 @@ AC_ARG_ENABLE([ofono], AS_HELP_STRING([--enable-ofono], [Enable ofono DBUS inter
    no)  ofono=false ;;
    *) AC_MSG_ERROR([bad value ${enableval} for --enable-ofono]) ;;
    esac],[ofono=false])
-AM_CONDITIONAL([SYSTEMD], [test x$ofono = xtrue])
+AM_CONDITIONAL([OFONO], [test x$ofono = xtrue])
 
 PKG_CHECK_MODULES([USB_MODED], [
  glib-2.0 >= 2.24.0
diff --git a/src/usb_moded.c b/src/usb_moded.c
index 63b1493..e96e512 100644
--- a/src/usb_moded.c
+++ b/src/usb_moded.c
@@ -613,7 +613,9 @@ static void handle_exit(void)
   appsync_stop();
   hwal_cleanup();
   usb_moded_dbus_cleanup();
+#ifdef MEEGOLOCK
   stop_devicelock_listener();
+#endif /* MEEGOLOCK */
 
   free_mode_list(modelist);
   kmod_unref(ctx);