diff --git a/Makefile.am b/Makefile.am
index cc85445d4..282f6c707 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2509,6 +2509,53 @@ src_devices_wifi_tests_test_general_LDADD = src/libNetworkManager.la
 
 endif
 
+###############################################################################
+# src/devices/team
+###############################################################################
+
+if WITH_TEAMDCTL
+
+pkglib_LTLIBRARIES += src/devices/team/libnm-device-plugin-team.la
+
+src_devices_team_libnm_device_plugin_team_la_SOURCES = \
+	src/devices/team/nm-team-factory.c \
+	src/devices/team/nm-device-team.c \
+	src/devices/team/nm-device-team.h
+
+src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src \
+	-I${top_srcdir}/src/devices \
+	-I${top_srcdir}/src/platform \
+	-I${top_srcdir}/src/settings \
+	-I${top_builddir}/introspection \
+	-I${top_srcdir}/shared \
+	-I$(top_builddir)/shared \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/libnm-core \
+	-DG_LOG_DOMAIN=\""NetworkManager"\" \
+	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
+	${LIBTEAMDCTL_CFLAGS} \
+	$(GLIB_CFLAGS)
+
+src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
+	-module -avoid-version \
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
+
+src_devices_team_libnm_device_plugin_team_la_LIBADD = \
+	introspection/libnmdbus.la \
+	$(LIBTEAMDCTL_LIBS) \
+	$(GLIB_LIBS) \
+	$(GUDEV_LIBS)
+
+check-local-devices-team: src/devices/team/libnm-device-plugin-team.la
+	$(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so "$(top_srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/devices/team/.libs/libnm-device-plugin-team.so)
+
+check_local += check-local-devices-team
+
+endif
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/configure.ac b/configure.ac
index 039bb00f6..742ca1df6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1146,7 +1146,6 @@ src/rdisc/Makefile
 src/rdisc/tests/Makefile
 src/devices/Makefile
 src/devices/tests/Makefile
-src/devices/team/Makefile
 libnm/libnm.pc
 libnm-util/libnm-util.pc
 libnm-util/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index c36375841..099ac5fb3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,5 @@
 SUBDIRS =
 
-if WITH_TEAMDCTL
-SUBDIRS += devices/team
-endif
-
 if ENABLE_TESTS
 SUBDIRS += \
 	dnsmasq-manager/tests \
diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
deleted file mode 100644
index 2810c494c..000000000
--- a/src/devices/team/Makefile.am
+++ /dev/null
@@ -1,48 +0,0 @@
-include $(GLIB_MAKEFILE)
-
-include $(top_srcdir)/nm.mk
-
-@GNOME_CODE_COVERAGE_RULES@
-
-AM_CPPFLAGS = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/settings \
-	-I${top_builddir}/introspection \
-	-I${top_srcdir}/shared \
-	-I$(top_builddir)/shared \
-	-I${top_builddir}/libnm-core \
-	-I${top_srcdir}/libnm-core \
-	-DG_LOG_DOMAIN=\""NetworkManager"\" \
-	-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-	$(GLIB_CFLAGS)
-
-if WITH_TEAMDCTL
-AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS}
-endif
-
-pkglib_LTLIBRARIES = libnm-device-plugin-team.la
-
-libnm_device_plugin_team_la_SOURCES = \
-	nm-team-factory.c \
-	nm-device-team.c \
-	nm-device-team.h
-
-libnm_device_plugin_team_la_LDFLAGS = \
-	-module -avoid-version \
-	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
-
-libnm_device_plugin_team_la_LIBADD = \
-	$(top_builddir)/introspection/libnmdbus.la \
-	$(GLIB_LIBS) \
-	$(GUDEV_LIBS)
-
-if WITH_TEAMDCTL
-libnm_device_plugin_team_la_LIBADD += $(LIBTEAMDCTL_LIBS)
-endif
-
-check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-team.so "$(top_srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-team.so)