diff --git a/Makefile.am b/Makefile.am
index e3034cf45d..dc8f6c9c9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2432,6 +2432,58 @@ check_local += check-local-devices-bluetooth
 
 endif
 
+###############################################################################
+# src/devices/wifi
+###############################################################################
+
+if WITH_WIFI
+
+pkglib_LTLIBRARIES += src/devices/wifi/libnm-device-plugin-wifi.la
+
+src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES = \
+	src/devices/wifi/nm-wifi-factory.c \
+	src/devices/wifi/nm-device-wifi.c \
+	src/devices/wifi/nm-device-wifi.h \
+	src/devices/wifi/nm-wifi-ap.c \
+	src/devices/wifi/nm-wifi-ap.h \
+	src/devices/wifi/nm-wifi-utils.c \
+	src/devices/wifi/nm-wifi-utils.h \
+	src/devices/wifi/nm-device-olpc-mesh.c \
+	src/devices/wifi/nm-device-olpc-mesh.h
+
+src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
+	-I${top_srcdir}/src \
+	-I${top_builddir}/src \
+	-I${top_srcdir}/src/devices \
+	-I${top_srcdir}/src/settings \
+	-I${top_srcdir}/src/platform \
+	-I${top_srcdir}/src/supplicant-manager \
+	-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)
+
+src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
+	-module -avoid-version \
+	-Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
+
+src_devices_wifi_libnm_device_plugin_wifi_la_LIBADD = \
+	introspection/libnmdbus.la \
+	$(GLIB_LIBS) \
+	$(GUDEV_LIBS)
+
+check-local-devices-wifi: src/devices/wifi/libnm-device-plugin-wifi.la
+	$(top_srcdir)/tools/check-exports.sh $(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so "$(top_srcdir)/linker-script-devices.ver"
+	$(call check_so_symbols,$(builddir)/src/devices/wifi/.libs/libnm-device-plugin-wifi.so)
+
+check_local += check-local-devices-wifi
+
+endif
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 45c0ef7399..1d42320f0d 100644
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -1,49 +1 @@
-include $(GLIB_MAKEFILE)
-
-include $(top_srcdir)/nm.mk
-
-@GNOME_CODE_COVERAGE_RULES@
-
-SUBDIRS=. tests
-
-AM_CPPFLAGS = \
-	-I${top_srcdir}/src \
-	-I${top_builddir}/src \
-	-I${top_srcdir}/src/devices \
-	-I${top_srcdir}/src/settings \
-	-I${top_srcdir}/src/platform \
-	-I${top_srcdir}/src/supplicant-manager \
-	-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)
-
-pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la
-
-libnm_device_plugin_wifi_la_SOURCES = \
-	nm-wifi-factory.c \
-	nm-device-wifi.c \
-	nm-device-wifi.h \
-	nm-wifi-ap.c \
-	nm-wifi-ap.h \
-	nm-wifi-utils.c \
-	nm-wifi-utils.h \
-	nm-device-olpc-mesh.c \
-	nm-device-olpc-mesh.h
-
-libnm_device_plugin_wifi_la_LDFLAGS = \
-	-module -avoid-version \
-	 -Wl,--version-script="$(top_srcdir)/linker-script-devices.ver"
-
-libnm_device_plugin_wifi_la_LIBADD = \
-	$(top_builddir)/introspection/libnmdbus.la \
-	$(GLIB_LIBS) \
-	$(GUDEV_LIBS)
-
-check-local:
-	$(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm-device-plugin-wifi.so "$(top_srcdir)/linker-script-devices.ver"
-	$(call check_so_symbols,$(builddir)/.libs/libnm-device-plugin-wifi.so)
+SUBDIRS=tests