diff --git a/x11/sterm/Makefile b/x11/sterm/Makefile
index 30e7192a6d45..bce7879dd15c 100644
--- a/x11/sterm/Makefile
+++ b/x11/sterm/Makefile
@@ -1,67 +1,65 @@
 PORTNAME=	sterm
 DISTVERSION=	0.9
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/st/
 DISTNAME=	st-${PORTVERSION}
 
 MAINTAINER=	pkubaj@FreeBSD.org
 COMMENT=	Simple X terminal
 WWW=		https://st.suckless.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		pkgconfig xorg
 USE_XORG=	x11 xext xft
 
 PLIST_FILES=	bin/st man/man1/st.1.gz
 
 # This way we avoid running tic on st.info which does not work as expected.
 BINARY_ALIAS=	tic=true
 
 PORTDATA=	config.def.h st.info
 PORTDOCS=	FAQ LEGACY README TODO
 
 OPTIONS_DEFINE=	DOCS SCROLLBACK XRESOURCES
 SCROLLBACK_DESC=	Scroll back through terminal output
 XRESOURCES_DESC=	Allow to handle settings from Xresources
 
 SCROLLBACK_PATCH_SITES=	https://st.suckless.org/patches/scrollback/
-SCROLLBACK_PATCHFILES=	st-scrollback-20210507-4536f46.diff:-p1 \
-			st-scrollback-mouse-20191024-a2c479c.diff:-p1
+SCROLLBACK_PATCHFILES=	st-scrollback-0.8.5.diff:-p1 \
+			st-scrollback-mouse-20220127-2c5edf2.diff:-p1
 
 XRESOURCES_PATCH_SITES=	https://st.suckless.org/patches/xresources/
 XRESOURCES_PATCHFILES=	st-xresources-20200604-9ba7ecf.diff:-p1
 
-MAKE_JOBS_UNSAFE=	yes
-
 pre-everything::
 	@${ECHO_MSG} "You can build st with your own config.h using the ST_CONF knob:"
 	@${ECHO_MSG} "make ST_CONF=/path/to/st/config.h install clean"
 
 post-patch:
 .if defined(ST_CONF)
 	@${ECHO_MSG} "creating config.h from ${ST_CONF}"
 	@${LN} -sf ${ST_CONF} ${WRKSRC}/config.h
 .endif
 	@${REINPLACE_CMD} -e 's|^VERSION = .*|VERSION = ${PORTVERSION}|' \
 		-e 's|^PREFIX = .*|PREFIX = ${PREFIX}|' \
 		-e "s|^MANPREFIX = .*|MANPREFIX = ${MANPREFIX}/man|" \
 		-e "s|^X11INC = .*|X11INC = ${LOCALBASE}/include|" \
 		-e "s|^X11LIB = .*|X11LIB = ${LOCALBASE}/lib|" \
 		-e "s|^CPPFLAGS =|CPPFLAGS +=|" \
 		${WRKSRC}/config.mk
 
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/st
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDATA} ${STAGEDIR}${DATADIR}
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/x11/sterm/distinfo b/x11/sterm/distinfo
index b6b0b57fb0fe..e6cd028b099a 100644
--- a/x11/sterm/distinfo
+++ b/x11/sterm/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1665250902
+TIMESTAMP = 1665654917
 SHA256 (st-0.9.tar.gz) = f36359799734eae785becb374063f0be833cf22f88b4f169cd251b99324e08e7
 SIZE (st-0.9.tar.gz) = 48171
+SHA256 (st-scrollback-0.8.5.diff) = dc7f5223b26fc813d91d4ae35bdaa54d63024cae9f18afd9b3594ba3399dfa55
+SIZE (st-scrollback-0.8.5.diff) = 8914
+SHA256 (st-scrollback-mouse-20220127-2c5edf2.diff) = 46ac9bcdbfeb0011533207cb0ab31657a3eb9196da1d0db346e6a9d1fc4b4f76
+SIZE (st-scrollback-mouse-20220127-2c5edf2.diff) = 894
+SHA256 (st-xresources-20200604-9ba7ecf.diff) = 5be9b40d2b51761685f6503e92028a7858cc6571a8867b88612fce8a70514d5b
+SIZE (st-xresources-20200604-9ba7ecf.diff) = 4840