diff --git a/devel/openocd/Makefile b/devel/openocd/Makefile
--- a/devel/openocd/Makefile
+++ b/devel/openocd/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	openocd
 DISTVERSION=	0.12.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -32,14 +32,15 @@
 # Note: Some adapters are not supported or do not currently work on FreeBSD.
 #       These have been consciously left out of this port entirely.
 
-OPTIONS_DEFAULT=	JIMTCL_INTERNAL LIBUSB LIBHIDAPI LIBFTDI SERIAL
+OPTIONS_DEFAULT=	BITBANG_REMOTE JIMTCL_INTERNAL LIBUSB LIBHIDAPI LIBFTDI SERIAL
 OPTIONS_GROUP=		DEBUG ADAPTERS
-OPTIONS_GROUP_ADAPTERS=	LIBUSB LIBHIDAPI LIBFTDI SERIAL PARPORT
+OPTIONS_GROUP_ADAPTERS=	BITBANG_REMOTE LIBUSB LIBHIDAPI LIBFTDI SERIAL PARPORT
 OPTIONS_GROUP_DEBUG=	VERBOSE_JTAGIO VERBOSE_USBIO VERBOSE_USBCOMM
 OPTIONS_SINGLE=		JIMTCL
 OPTIONS_SINGLE_JIMTCL=	JIMTCL_INTERNAL JIMTCL_EXTERNAL
 
 ADAPTERS_DESC=		Hardware adapters/programmers/debuggers support
+BITBANG_REMOTE_DESC=	Remote bitbang driver
 JIMTCL_DESC=		Jim Tcl interpreter
 JIMTCL_EXTERNAL_DESC=	External
 JIMTCL_INTERNAL_DESC=	Internal
@@ -52,6 +53,9 @@
 VERBOSE_USBCOMM_DESC=	Enable verbose USB communication messages
 VERBOSE_USBIO_DESC=	Enable verbose USB I/O messages
 
+# Remote bitbang driver
+BITBANG_REMOTE_CONFIGURE_ENABLE=	remote-bitbang
+
 # Internal (built-in) or external Jim Tcl interpreter
 JIMTCL_EXTERNAL_LIB_DEPENDS=		libjim.so:lang/jimtcl
 JIMTCL_EXTERNAL_USES=			localbase:ldflags