diff --git a/ipmitool/configure.in b/ipmitool/configure.in
index 0c34156..50773f3 100644
--- a/ipmitool/configure.in
+++ b/ipmitool/configure.in
@@ -91,6 +91,17 @@ solaris*)
 	enable_intf_bmc=no
 	enable_ipmishell=no
 	;;
+*freebsd*)
+	enable_intf_imb=no
+	enable_intf_lipmi=no
+	enable_intf_bmc=no
+	;;
+*netbsd*)
+	enable_intf_imb=no
+	enable_intf_lipmi=no
+	enable_intf_bmc=no
+	enable_intf_open=no
+	;;
 esac
 
 AC_SUBST(ARCH, $host_cpu)
diff --git a/ipmitool/include/ipmitool/Makefile.am b/ipmitool/include/ipmitool/Makefile.am
index 20a8f12..fcbb723 100644
--- a/ipmitool/include/ipmitool/Makefile.am
+++ b/ipmitool/include/ipmitool/Makefile.am
@@ -36,5 +36,5 @@ noinst_HEADERS = log.h bswap.h helper.h ipmi.h ipmi_intf.h \
 	ipmi_channel.h ipmi_sensor.h ipmi_event.h ipmi_session.h \
 	ipmi_strings.h ipmi_constants.h ipmi_user.h ipmi_pef.h \
 	ipmi_oem.h ipmi_isol.h ipmi_sunoem.h ipmi_picmg.h \
-	ipmi_fwum.h ipmi_main.h ipmi_tsol.h
+	ipmi_fwum.h ipmi_main.h ipmi_tsol.h ipmi_firewall.h