diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile
index c0f8b79cedf..7161014a912 100644
--- a/comms/conserver/Makefile
+++ b/comms/conserver/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.51 2015/06/10 13:07:33 sthen Exp $
+# $OpenBSD: Makefile,v 1.52 2015/08/11 21:13:14 sthen Exp $
 
 COMMENT=	manage remote serial consoles via TCP/IP
 
@@ -14,7 +14,7 @@ PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB += c util
 
-FLAVORS=	net
+FLAVORS=	ipmi net
 FLAVOR?=
 
 MASTER_SITES=	${HOMEPAGE} \
@@ -28,7 +28,7 @@ CONFIGURE_ARGS=	--with-master=localhost \
 .if ${FLAVOR:Mnet}
 # not yet using experimental IPv6 support added in 8.2.0; investigate
 # implications of ifdef'ing out ProbeInterfaces in cutil.c before enabling
-WANTLIB += crypto ssl
+WANTLIB+= crypto ssl
 CONFIGURE_ARGS+= --with-openssl \
 		--with-port=3109
 .else
@@ -36,6 +36,12 @@ CONFIGURE_ARGS+= --with-uds=${LOCALSTATEDIR}/run/conserver \
 		--with-trust-uds-cred
 .endif
 
+.if ${FLAVOR:Mipmi}
+CONFIGURE_ARGS+= --with-freeipmi=yes
+LIB_DEPENDS+=	sysutils/freeipmi
+WANTLIB+=	freeipmi ipmiconsole pthread
+.endif
+
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/conserver.cf/samples/* \
 	    ${FILESDIR}/console.cf ${PREFIX}/share/examples/conserver/
diff --git a/comms/conserver/patches/patch-configure_in b/comms/conserver/patches/patch-configure_in
index bc7b91d44b3..5725f180b06 100644
--- a/comms/conserver/patches/patch-configure_in
+++ b/comms/conserver/patches/patch-configure_in
@@ -1,6 +1,6 @@
-$OpenBSD: patch-configure_in,v 1.4 2014/10/07 22:14:17 sthen Exp $
---- configure.in.orig	Fri Apr 18 05:55:38 2014
-+++ configure.in	Tue Oct  7 21:24:43 2014
+$OpenBSD: patch-configure_in,v 1.5 2015/08/11 21:13:14 sthen Exp $
+--- configure.in.orig	Thu Apr 17 22:55:38 2014
++++ configure.in	Thu Jul 30 16:52:11 2015
 @@ -413,14 +413,14 @@ AC_ARG_WITH(uds,
  			    AC_TRY_COMPILE([#include <sys/types.h>
  				    #include <sys/socket.h>],
@@ -60,3 +60,35 @@ $OpenBSD: patch-configure_in,v 1.4 2014/10/07 22:14:17 sthen Exp $
  				    ])
  			    ;;
  			*)
+@@ -653,27 +669,26 @@ AC_ARG_WITH(freeipmi,
+ 		FREEIPMILDFLAGS="-L$withval/lib -R$withval/lib"
+ 	    fi
+ 	else
+-	    FREEIPMICPPFLAGS=""
+-	    FREEIPMILDFLAGS=""
++	    FREEIPMICPPFLAGS="`pkg-config --cflags libfreeipmi`"
++	    FREEIPMILDFLAGS="`pkg-config --libs libfreeipmi`"
+ 	fi
+ 
+ 	oCPPFLAGS="$CPPFLAGS"
+ 	oLDFLAGS="$LDFLAGS"
+ 	oLIBS="$LIBS"
+ 	have_freeipmi=no
+-
+ 	CPPFLAGS="$CPPFLAGS $FREEIPMICPPFLAGS"
+ 	LDFLAGS="$LDFLAGS $FREEIPMILDFLAGS"
+ 
+ 	AC_CHECK_HEADER([ipmiconsole.h],
+-	    [LIBS="$LIBS -lipmiconsole"
++	    [LIBS="$LIBS `pkg-config --libs libipmiconsole`"
+ 	    AC_MSG_CHECKING(for freeipmi libraries -lipmiconsole)
+ 	    AC_TRY_LINK([#include <ipmiconsole.h>
+ 		],[ipmiconsole_ctx_fd(0)],
+ 		[AC_MSG_RESULT(yes)
+ 		cons_with_freeipmi="YES"
+ 		AC_DEFINE(HAVE_FREEIPMI)
+-		CONSLIBS="$CONSLIBS -lipmiconsole"
++		CONSLIBS="$CONSLIBS `pkg-config --libs libipmiconsole`"
+ 		have_freeipmi=yes],
+ 		[AC_MSG_RESULT(no)])],)
+ 
diff --git a/comms/conserver/pkg/DESCR b/comms/conserver/pkg/DESCR
index d8fb4ced2e0..8bf0fe80f00 100644
--- a/comms/conserver/pkg/DESCR
+++ b/comms/conserver/pkg/DESCR
@@ -15,3 +15,5 @@ Flavors:
 net - use network sockets rather than unix domain sockets
 (as was previously the default). This is mainly useful when
 the conserver server is on a separate machine to the client.
+
+ipmi - build with internal support for IPMI serial-over-lan