diff --git a/Makefile.am b/Makefile.am
index 12db4f0c34..f16ea90ac6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,6 +16,7 @@ noinst_PROGRAMS =
 check_PROGRAMS =
 noinst_DATA =
 sbin_PROGRAMS =
+bin_PROGRAMS =
 libexec_PROGRAMS =
 lib_LTLIBRARIES =
 pkglib_LTLIBRARIES =
@@ -3071,6 +3072,30 @@ EXTRA_DIST += \
 	dispatcher/tests/dispatcher-vpn-down \
 	dispatcher/tests/dispatcher-vpn-up
 
+###############################################################################
+# clients
+###############################################################################
+
+bin_PROGRAMS += clients/nm-online
+
+clients_nm_online_CPPFLAGS = \
+	-I${top_srcdir}/shared \
+	-I$(top_builddir)/shared \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm \
+	-I${top_builddir}/libnm \
+	$(GLIB_CFLAGS) \
+	-DG_LOG_DOMAIN=\""nm-online"\" \
+	-DNMLOCALEDIR=\"$(datadir)/locale\"
+
+clients_nm_online_LDFLAGS = \
+	-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
+
+clients_nm_online_LDADD = \
+	libnm/libnm.la \
+	$(GLIB_LIBS)
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/clients/Makefile.am b/clients/Makefile.am
index 46cb1d1e01..fbbb71f80d 100644
--- a/clients/Makefile.am
+++ b/clients/Makefile.am
@@ -1,25 +1 @@
 SUBDIRS = cli tui
-
-AM_CPPFLAGS = \
-	-I${top_srcdir}/shared \
-	-I$(top_builddir)/shared \
-	-I${top_srcdir}/libnm-core \
-	-I${top_builddir}/libnm-core \
-	-I${top_srcdir}/libnm \
-	-I${top_builddir}/libnm \
-	$(GLIB_CFLAGS) \
-	-DNMLOCALEDIR=\"$(datadir)/locale\"
-
-bin_PROGRAMS = nm-online
-
-nm_online_SOURCES = nm-online.c
-nm_online_CPPFLAGS = \
-	-DG_LOG_DOMAIN=\""nm-online"\" \
-	$(AM_CPPFLAGS)
-
-nm_online_LDFLAGS = \
-	-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
-
-nm_online_LDADD = \
-	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS)