diff --git a/devel/msp430-debug-stack/Makefile b/devel/msp430-debug-stack/Makefile
index 0138c3b9b67b..fb53fd807679 100644
--- a/devel/msp430-debug-stack/Makefile
+++ b/devel/msp430-debug-stack/Makefile
@@ -1,54 +1,54 @@
 PORTNAME=	msp430-debug-stack
-PORTVERSION=	3.15.0.1
+PORTVERSION=	3.15.1.1
 PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPDS/3_15_0_000/export/ \
-		http://www.ti.com/lit/ug/slau320ai/:doc1 \
-		http://www.ti.com/lit/ug/slau656b/:doc2
+MASTER_SITES=	https://dr-download.ti.com/software-development/driver-or-library/MD-4vnqcP1Wk4/${PORTVERSION}/ \
+		http://www.ti.com/lit/ug/slau320aj/:doc1 \
+		http://www.ti.com/lit/ug/slau656d/:doc2
 DISTFILES=	MSPDebugStack_OS_Package_${PORTVERSION:S/./_/g}.zip \
-		slau320ai.pdf:doc1 \
-		slau656b.pdf:doc2
+		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
 
 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}/slau320ai.pdf ${STAGEDIR}${DOCSDIR}/
-	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/slau656b.pdf ${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
 
 .include <bsd.port.mk>
diff --git a/devel/msp430-debug-stack/distinfo b/devel/msp430-debug-stack/distinfo
index ddf05f046075..4708eb3708bf 100644
--- a/devel/msp430-debug-stack/distinfo
+++ b/devel/msp430-debug-stack/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1585852124
-SHA256 (MSPDebugStack_OS_Package_3_15_0_1.zip) = 31f8f66ce9f9156bcb550adf3937ebf44ad7995bef2517f2b09e408be947c4c5
-SIZE (MSPDebugStack_OS_Package_3_15_0_1.zip) = 2183498
-SHA256 (slau320ai.pdf) = f8444827b5536939872842a6ad11a0e92caaf02620d5ca59efefc68e1bf6c3ae
-SIZE (slau320ai.pdf) = 753510
-SHA256 (slau656b.pdf) = a27303bf1060a598bab53481cdee05642dbb3cde7804786c5ab31cb1e911df0c
-SIZE (slau656b.pdf) = 487655
+TIMESTAMP = 1649886164
+SHA256 (MSPDebugStack_OS_Package_3_15_1_1.zip) = e3a59a98c43de7a92e5814d8c3304026165e6d2551e60acaca1f08c6b1a4bac8
+SIZE (MSPDebugStack_OS_Package_3_15_1_1.zip) = 2184052
+SHA256 (slau320aj.pdf) = 75ceec478d97ed2e1293a177fc794f22ef70f9eac21e44ae83ed091a656cf201
+SIZE (slau320aj.pdf) = 1736913
+SHA256 (slau656d.pdf) = 4fd5dfb2a544c2efbbda0c2d33467f5f377bcae903b499195f27da077da0a603
+SIZE (slau656d.pdf) = 988873
diff --git a/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp b/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp
new file mode 100644
index 000000000000..7a6bcf72389a
--- /dev/null
+++ b/devel/msp430-debug-stack/files/patch-DLL430__v3_src_TI_DLL430_FetControl.cpp
@@ -0,0 +1,11 @@
+--- DLL430_v3/src/TI/DLL430/FetControl.cpp.orig	2020-12-05 20:54:24 UTC
++++ DLL430_v3/src/TI/DLL430/FetControl.cpp
+@@ -225,7 +225,7 @@ bool FetControl::resetCommunication()
+ 	data.push_back(0x00);
+ 	this->sendData(data);		// reset connection
+ 
+-	std::this_thread::sleep_for(std::chrono::milliseconds(100));
++	std::this_thread::sleep_for(std::chrono::milliseconds(300));
+ 
+ 	HalExecElement* el = new HalExecElement(ID_Zero);
+ 	el->appendInputData8(STREAM_CORE_ZERO_VERSION);
diff --git a/devel/msp430-debug-stack/pkg-plist b/devel/msp430-debug-stack/pkg-plist
index 9c2b35bfa746..5a06858bd3a7 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%%/slau320ai.pdf
-%%PORTDOCS%%%%DOCSDIR%%/slau656b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/slau320aj.pdf
+%%PORTDOCS%%%%DOCSDIR%%/slau656d.pdf
 etc/devd/mspfet.conf