diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h b/sys/contrib/dev/iwlwifi/iwl-debug.h
index 43288a5a8d7..7b3b402766b 100644
--- a/sys/contrib/dev/iwlwifi/iwl-debug.h
+++ b/sys/contrib/dev/iwlwifi/iwl-debug.h
@@ -47,7 +47,7 @@ enum iwl_dl {
 	IWL_DL_DROP		= 0x00000010,
 	IWL_DL_EEPROM		= 0x00000020,
 	IWL_DL_FW		= 0x00000040,
-	/*			= 0x00000080, */
+	IWL_DL_DEV_RADIO	= 0x00000080,
 	IWL_DL_HC		= 0x00000100,
 	IWL_DL_HT		= 0x00000200,
 	IWL_DL_INFO		= 0x00000400,
@@ -195,6 +195,8 @@ void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...);
 	IWL_DPRINTF(_subsys, IWL_DL_WEP, _fmt, ##__VA_ARGS__)
 #define	IWL_DEBUG_WOWLAN(_subsys, _fmt, ...)				\
 	IWL_DPRINTF(_subsys, IWL_DL_WOWLAN, _fmt, ##__VA_ARGS__)
+#define	IWL_DEBUG_DEV_RADIO(_dev, _fmt, ...)				\
+	IWL_DPRINTF_DEV((_dev), IWL_DL_DEV_RADIO, _fmt, ##__VA_ARGS__)
 
 #define	IWL_DEBUG_PCI_RW(_subsys, _fmt, ...)				\
 	IWL_DPRINTF(_subsys, IWL_DL_PCI_RW, _fmt, ##__VA_ARGS__)
diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile
index fd11e670b54..7f4ef7d8d32 100644
--- a/sys/modules/iwlwifi/Makefile
+++ b/sys/modules/iwlwifi/Makefile
@@ -5,6 +5,7 @@ DEVIWLWIFIDIR=	${SRCTOP}/sys/contrib/dev/iwlwifi
 
 WITH_CONFIG_PM=	0
 WITH_DEBUGFS=	1
+WITH_CONFIG_ACPI=	1
 
 KMOD=	if_iwlwifi
 
@@ -41,6 +42,12 @@ CFLAGS+=	-DCONFIG_PM
 CFLAGS+=	-DCONFIG_PM_SLEEP
 .endif
 
+.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0
+SRCS+=	fw/acpi.c
+CFLAGS+=	-DCONFIG_ACPI
+CFLAGS+=	-DLINUXKPI_WANT_LINUX_ACPI
+.endif
+
 SRCS+=	iwl-devtrace.c
 
 # Other
@@ -57,7 +64,6 @@ CFLAGS+=	-DCONFIG_IWLMVM=1
 # Helpful after fresh imports.
 #CFLAGS+=	-ferror-limit=0
 
-#CFLAGS+=	-DCONFIG_ACPI=1
 #CFLAGS+=	-DCONFIG_INET=1		# Need LKPI TSO implementation.
 #CFLAGS+=	-DCONFIG_IPV6=1
 CFLAGS+=	-DCONFIG_IWLWIFI_DEBUG=1