diff --git x11/sterm/Makefile x11/sterm/Makefile
index d9dee605dea0..c903b033f372 100644
--- x11/sterm/Makefile
+++ x11/sterm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sterm
-PORTVERSION=	0.7
+DISTVERSION=	0.8
 CATEGORIES=	x11
 MASTER_SITES=	http://dl.suckless.org/st/
 DISTNAME=	st-${PORTVERSION}
@@ -10,10 +10,8 @@ DISTNAME=	st-${PORTVERSION}
 MAINTAINER=	pkubaj@anongoth.pl
 COMMENT=	Simple X terminal
 
-LICENSE=	MITX
-LICENSE_NAME=	MIT/X Consortium License
+LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
-LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
@@ -23,10 +21,16 @@ USE_XORG=	x11 xext xft
 
 PLIST_FILES=	bin/st man/man1/st.1.gz
 
-PORTDOCS=	README
+# This way we avoid running tic on st.info as does not work as expected.
+BINARY_ALIAS=	tic=true
+
+PORTDATA=	config.def.h st.info
+PORTDOCS=	FAQ LEGACY README TODO
 
 OPTIONS_DEFINE=	DOCS
 
+SUB_FILES=	pkg-message
+
 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"
@@ -34,18 +38,22 @@ pre-everything::
 post-patch:
 .if defined(ST_CONF)
 	@${ECHO_MSG} "creating config.h from ${ST_CONF}"
-	@${CP} ${ST_CONF} ${WRKSRC}/config.h
+	@${LN} -sf ${ST_CONF} ${WRKSRC}/config.h
 .endif
 	@${REINPLACE_CMD} -e 's|^VERSION = .*|VERSION = ${PORTVERSION}|' \
 		-e 's|^PREFIX = .*|PREFIX = ${PREFIX}|' \
-		-e 's|^LOCALBASE = .*|LOCALBASE = ${LOCALBASE}|' \
 		-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}
+.for data in ${PORTDATA}
+	${INSTALL_DATA} ${WRKSRC}/${data} ${STAGEDIR}${DATADIR}
+.endfor
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git x11/sterm/distinfo x11/sterm/distinfo
index 62ce1d5a5214..ed5c3d27f4db 100644
--- x11/sterm/distinfo
+++ x11/sterm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471840973
-SHA256 (st-0.7.tar.gz) = f7870d906ccc988926eef2cc98950a99cc78725b685e934c422c03c1234e6000
-SIZE (st-0.7.tar.gz) = 42418
+TIMESTAMP = 1521122661
+SHA256 (st-0.8.tar.gz) = 77353920d07d66c684a0f57ec37c2670c42fdc5c871d6382b701601cdc597576
+SIZE (st-0.8.tar.gz) = 45401
diff --git x11/sterm/files/patch-Makefile x11/sterm/files/patch-Makefile
deleted file mode 100644
index fcd8362232cb..000000000000
--- x11/sterm/files/patch-Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.orig	2016-08-11 14:25:58 UTC
-+++ Makefile
-@@ -49,7 +49,6 @@ install: all
- 	@sed "s/VERSION/${VERSION}/g" < st.1 > ${DESTDIR}${MANPREFIX}/man1/st.1
- 	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/st.1
- 	@echo Please see the README file regarding the terminfo entry of st.
--	@tic -s st.info
- 
- uninstall:
- 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
diff --git x11/sterm/files/pkg-message.in x11/sterm/files/pkg-message.in
new file mode 100644
index 000000000000..3c60346ccedb
--- /dev/null
+++ x11/sterm/files/pkg-message.in
@@ -0,0 +1,14 @@
+If you are running FreeBSD 11.1 or older then in order to add st.info the the
+terminal capability database it is required to:
+
+ * Install tic (included in devel/ncurses).
+ * Run:
+
+   # tic -C -K -s -x %%DATADIR%%/st.info >> /usr/share/misc/termcap
+   # cd /usr/share/misc
+   # cap_mkdb termcap
+
+Thanks to r331006 [1], this hack is not necessary on FreeBSD 11.2-RELEASE,
+11-STABLE and 12-CURRENT.
+
+[1]: https://svnweb.freebsd.org/base?view=revision&revision=331006
diff --git x11/sterm/pkg-descr x11/sterm/pkg-descr
index 369e0d6ae89d..0ab4ebbb56f4 100644
--- x11/sterm/pkg-descr
+++ x11/sterm/pkg-descr
@@ -3,4 +3,4 @@ st is a minimalistic X terminal.
 It consists of a single binary, configuration is done at compile-time by a
 config.h file.
 
-WWW: http://st.suckless.org/
+WWW: https://st.suckless.org/