diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index aacbd4a708f6..0b49ac64867e 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,31 +1,36 @@
 PORTNAME=	libpcap
 PORTVERSION=	1.10.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 MASTER_SITES=	http://www.tcpdump.org/release/
 
 MAINTAINER=	garga@FreeBSD.org
 COMMENT=	Ubiquitous network traffic capture library
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
 
 USES=		bison cpe gmake ssl
 
 CPE_VENDOR=	tcpdump
 
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--enable-dbus=no \
 		--with-pcap=bpf
 CONFIGURE_ENV+=	LEX=${LOCALBASE}/bin/flex
 CFLAGS_amd64=	-fPIC
 CFLAGS_sparc64=	-fPIC
 PLIST_SUB+=	PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=	IPV6
+OPTIONS_DEFINE=	IPV6 REMOTE
+
+OPTIONS_SUB=	yes
+
+REMOTE_DESC=	Remote packet capture
 
 IPV6_CONFIGURE_ENABLE=	ipv6
+REMOTE_CONFIGURE_ENABLE=remote
 
 .include <bsd.port.mk>
diff --git a/net/libpcap/pkg-plist b/net/libpcap/pkg-plist
index 2d0bcaf73fc8..4bf6610af7ea 100644
--- a/net/libpcap/pkg-plist
+++ b/net/libpcap/pkg-plist
@@ -1,87 +1,90 @@
 bin/pcap-config
 include/pcap-bpf.h
 include/pcap-namedb.h
 include/pcap.h
 include/pcap/bluetooth.h
 include/pcap/bpf.h
 include/pcap/can_socketcan.h
 include/pcap/compiler-tests.h
 include/pcap/dlt.h
 include/pcap/funcattrs.h
 include/pcap/ipnet.h
 include/pcap/namedb.h
 include/pcap/nflog.h
 include/pcap/pcap-inttypes.h
 include/pcap/pcap.h
 include/pcap/sll.h
 include/pcap/socket.h
 include/pcap/usb.h
 include/pcap/vlan.h
 lib/libpcap.a
 lib/libpcap.so
-lib/libpcap.so.1
 lib/libpcap.so.%%PORTVERSION%%
+lib/libpcap.so.1
 libdata/pkgconfig/libpcap.pc
 man/man1/pcap-config.1.gz
 man/man3/pcap.3.gz
 man/man3/pcap_activate.3.gz
 man/man3/pcap_breakloop.3.gz
 man/man3/pcap_can_set_rfmon.3.gz
 man/man3/pcap_close.3.gz
 man/man3/pcap_compile.3.gz
 man/man3/pcap_create.3.gz
 man/man3/pcap_datalink.3.gz
 man/man3/pcap_datalink_name_to_val.3.gz
 man/man3/pcap_datalink_val_to_name.3.gz
 man/man3/pcap_dump.3.gz
 man/man3/pcap_dump_close.3.gz
 man/man3/pcap_dump_file.3.gz
 man/man3/pcap_dump_flush.3.gz
 man/man3/pcap_dump_ftell.3.gz
 man/man3/pcap_dump_open.3.gz
 man/man3/pcap_file.3.gz
 man/man3/pcap_fileno.3.gz
 man/man3/pcap_findalldevs.3.gz
 man/man3/pcap_freecode.3.gz
 man/man3/pcap_get_required_select_timeout.3.gz
 man/man3/pcap_get_selectable_fd.3.gz
 man/man3/pcap_get_tstamp_precision.3.gz
 man/man3/pcap_geterr.3.gz
 man/man3/pcap_init.3.gz
 man/man3/pcap_inject.3.gz
 man/man3/pcap_is_swapped.3.gz
 man/man3/pcap_lib_version.3.gz
 man/man3/pcap_list_datalinks.3.gz
 man/man3/pcap_list_tstamp_types.3.gz
 man/man3/pcap_lookupdev.3.gz
 man/man3/pcap_lookupnet.3.gz
 man/man3/pcap_loop.3.gz
 man/man3/pcap_major_version.3.gz
 man/man3/pcap_next_ex.3.gz
 man/man3/pcap_offline_filter.3.gz
 man/man3/pcap_open_dead.3.gz
 man/man3/pcap_open_live.3.gz
 man/man3/pcap_open_offline.3.gz
 man/man3/pcap_set_buffer_size.3.gz
 man/man3/pcap_set_datalink.3.gz
 man/man3/pcap_set_immediate_mode.3.gz
 man/man3/pcap_set_promisc.3.gz
 man/man3/pcap_set_protocol_linux.3.gz
 man/man3/pcap_set_rfmon.3.gz
 man/man3/pcap_set_snaplen.3.gz
 man/man3/pcap_set_timeout.3.gz
 man/man3/pcap_set_tstamp_precision.3.gz
 man/man3/pcap_set_tstamp_type.3.gz
 man/man3/pcap_setdirection.3.gz
 man/man3/pcap_setfilter.3.gz
 man/man3/pcap_setnonblock.3.gz
 man/man3/pcap_snapshot.3.gz
 man/man3/pcap_stats.3.gz
 man/man3/pcap_statustostr.3.gz
 man/man3/pcap_strerror.3.gz
 man/man3/pcap_tstamp_type_name_to_val.3.gz
 man/man3/pcap_tstamp_type_val_to_name.3.gz
 man/man5/pcap-savefile.5.gz
+%%REMOTE%%man/man5/rpcapd-config.5.gz
 man/man7/pcap-filter.7.gz
 man/man7/pcap-linktype.7.gz
 man/man7/pcap-tstamp.7.gz
+%%REMOTE%%man/man8/rpcapd.8.gz
+%%REMOTE%%sbin/rpcapd