diff --git a/devel/msp430-debug-stack/Makefile b/devel/msp430-debug-stack/Makefile
index 77b05bcbcc86..8c87cf41f3fb 100644
--- a/devel/msp430-debug-stack/Makefile
+++ b/devel/msp430-debug-stack/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	msp430-debug-stack
 PORTVERSION=	3.15.1.1
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel
 MASTER_SITES=	https://dr-download.ti.com/software-development/driver-or-library/MD-4vnqcP1Wk4/${PORTVERSION}/ \
 		LOCAL/lev:doc1 \
 		LOCAL/lev:doc2
 DISTFILES=	MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip \
 		slau320aj.pdf:doc1 \
 		slau656d.pdf:doc2
 EXTRACT_ONLY=	MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip
 
 MAINTAINER=	lev@FreeBSD.org
 COMMENT=	TI MSP430 debugging interface library
 WWW=		http://www.ti.com/tool/mspds
 
 LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libhidapi.so:comms/hidapi
 
 USES=		compiler:c++11-lib dos2unix gmake zip:infozip
 USE_LDCONFIG=	yes
 
 DOS2UNIX_REGEX=	.*/Makefile|.*\.(cpp|h)
 
 MAKE_ARGS=	BOOST_DIR=${LOCALBASE} \
 		HIDAPI_DIR=${LOCALBASE}
 
 MAKE_JOBS_UNSAFE=	yes
 NO_WRKSUBDIR=		yes
 
 SUB_FILES=	pkg-message
 
 REINPLACE_ARGS=	-i ""
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${FIND} ${WRKSRC}/DLL430_v3/src/TI/DLL430 \
 		\( -name '*.cpp' -o -name '*.h' \) -print0 | ${XARGS} -0 \
 		${REINPLACE_CMD} -e 's|[io]fstream|std::&|; s|std::std::|std::|'
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/libmsp430.so ${STAGEDIR}${PREFIX}/lib/libmsp430.so
 	${INSTALL_DATA} ${WRKSRC}/libmsp430.a ${STAGEDIR}${PREFIX}/lib/libmsp430.a
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/libmsp430
 	${INSTALL_DATA} ${WRKSRC}/DLL430_v3/include/* ${STAGEDIR}${PREFIX}/include/libmsp430/
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau320aj.pdf ${STAGEDIR}${DOCSDIR}/
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau656d.pdf ${STAGEDIR}${DOCSDIR}/
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/devd
-	${INSTALL_DATA} ${FILESDIR}/mspfet.conf ${STAGEDIR}${PREFIX}/etc/devd
+	${INSTALL_DATA} ${FILESDIR}/mspfet.conf.sample ${STAGEDIR}${PREFIX}/etc/devd
 
 .include <bsd.port.mk>
diff --git a/devel/msp430-debug-stack/files/mspfet.conf b/devel/msp430-debug-stack/files/mspfet.conf
deleted file mode 100644
index 3143c6d293cb..000000000000
--- a/devel/msp430-debug-stack/files/mspfet.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# Warning: Only a single instance of each FET product is supported
-#
-
-attach 20 {
-	device-name		"umodem[0-9]+";
-	match "vendor"		"0x2047";		# TI MSPBSL_STANDARD_USB_VID
-        match "product"		"0x001(0|3|4)";		# Products: UIF eZ-FET MSP-FET
-	match "interface"	"0";			# JTAG-Interface
-	action "cd /dev; p=$product; dn=$device-name;			\
-		un=$(sysctl -n dev.umodem.${dn#umodem}.ttyname);	\
-		chmod 666 cua${un}; ln -sf cua${un} mspfet${p#0x}";
-};
-
-notify 20 {
-	match "system"		"USB";
-	match "subsystem"	"INTERFACE";
-	match "type"		"DETACH";
-	match "vendor"		"0x2047";		# TI MSPBSL_STANDARD_USB_VID
-        match "product"		"0x001(0|3|4)";		# Products: UIF eZ-FET MSP-FET
-	match "interface"	"0";			# JTAG-Interface
-	action "p=$product; rm /dev/mspfet${p#0x}";
-};
diff --git a/devel/msp430-debug-stack/files/mspfet.conf.sample b/devel/msp430-debug-stack/files/mspfet.conf.sample
new file mode 100644
index 000000000000..11e4d0383642
--- /dev/null
+++ b/devel/msp430-debug-stack/files/mspfet.conf.sample
@@ -0,0 +1,53 @@
+# replacement /usr/local/etc/devd/mspfet.conf file that allows
+# unprivileged users in the 'operator' group to rw the MSP FETs
+# Warning: Only a single instance of each FET product is supported
+# while using mspdebug with the tilib interface
+
+attach 20 {
+    device-name "umodem[0-9]+";
+    match "vendor" "0x2047"; # TI MSPBSL_STANDARD_USB_VID
+    match "product" "0x001(0|3|4)"; # UIF eZ-FET MSP-FET
+    match "interface" "0"; # JTAG interface
+    action "cd /dev; p=$product; dn=$device-name; \
+        un=$(sysctl -n dev.umodem.${dn#umodem}.ttyname); \
+        chgrp operator cua${un}; chmod 660 cua${un}; \
+        ln -sf cua${un} mspfet${p#0x}";
+};
+
+attach 20 {
+    device-name "umodem[0-9]+";
+    match "vendor" "0x2047";
+    match "product" "0x001(0|3|4)";
+    match "interface" "2"; # back-channel uart interface
+    action "cd /dev; p=$product; dn=$device-name; \
+        un=$(sysctl -n dev.umodem.${dn#umodem}.ttyname); \
+        chgrp operator tty${un}; chmod 660 tty${un}";
+};
+
+notify 20 {
+    match "system" "USB";
+    match "subsystem" "INTERFACE";
+    match "type" "DETACH";
+    match "vendor" "0x2047";
+    match "product" "0x001(0|3|4)";
+    match "interface" "0"; # JTAG interface
+    action "p=$product; rm /dev/mspfet${p#0x}";
+};
+
+notify 100 {
+    match "system" "USB";
+    match "subsystem" "INTERFACE";
+    match "type" "ATTACH";
+    match "vendor" "0x2047";
+    match "product" "0x001(0|3|4)";
+    action "chgrp operator /dev/$cdev; chmod 660 /dev/$cdev";
+};
+
+notify 100 {
+    match "system" "USB";
+    match "subsystem" "INTERFACE";
+    match "type" "ATTACH";
+    match "vendor" "0x15ba"; # OLIMEX LTD
+    match "product" "0x0100"; # MSP430 JTAGISO ver.2
+    action "chgrp operator /dev/$cdev; chmod 660 /dev/$cdev";
+};
diff --git a/devel/msp430-debug-stack/pkg-plist b/devel/msp430-debug-stack/pkg-plist
index 5a06858bd3a7..94c36c67e23f 100644
--- a/devel/msp430-debug-stack/pkg-plist
+++ b/devel/msp430-debug-stack/pkg-plist
@@ -1,12 +1,12 @@
 include/libmsp430/DLL430_SYMBOL.h
 include/libmsp430/MSP430.h
 include/libmsp430/MSP430_Debug.h
 include/libmsp430/MSP430_EEM.h
 include/libmsp430/MSP430_EnergyTrace.h
 include/libmsp430/MSP430_FET.h
 include/libmsp430/MSP430_HIL.h
 lib/libmsp430.so
 lib/libmsp430.a
 %%PORTDOCS%%%%DOCSDIR%%/slau320aj.pdf
 %%PORTDOCS%%%%DOCSDIR%%/slau656d.pdf
-etc/devd/mspfet.conf
+@sample etc/devd/mspfet.conf.sample