diff --git a/graphics/libsixel/Makefile b/graphics/libsixel/Makefile
index c48382c294fd..b2063443c5f0 100644
--- a/graphics/libsixel/Makefile
+++ b/graphics/libsixel/Makefile
@@ -1,55 +1,57 @@
-PORTNAME=	libsixel
-PORTVERSION=	1.8.6
-PORTREVISION=	1
+PORTNAME=	sixel
+DISTVERSION=	1.8.7-r2
 PORTEPOCH=	1
 CATEGORIES=	graphics
-MASTER_SITES=	https://github.com/saitoha/libsixel/releases/download/v${PORTVERSION}/
+MASTER_SITES=	https://github.com/saitoha/libsixel/releases/download/v${DISTVERSION}/
+PKGNAMEPREFIX=	lib
 
 MAINTAINER=	sue@iwmt.org
 COMMENT=	Encoder/decoder library for DEC SIXEL graphics
 WWW=		https://github.com/saitoha/libsixel
 
 LICENSE=	MIT
 
 USES=		cpe libtool pkgconfig
 CPE_VENDOR=	saitoha
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--with-pkgconfigdir=${LOCALBASE}/libdata/pkgconfig
 INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/sixel-${PORTVERSION}
-
 PORTDOCS=	ChangeLog NEWS
 
 OPTIONS_DEFINE=	CURL DOCS GD JPEG PIXBUF PNG PYTHON
 OPTIONS_SUB=	yes
 
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl
 
 GD_LIB_DEPENDS=		libgd.so:graphics/gd
 GD_CONFIGURE_WITH=	gd
 
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_CPPFLAGS=		-I${LOCALBASE}/include
 JPEG_LDFLAGS=		-L${LOCALBASE}/lib
 
 PIXBUF_CONFIGURE_WITH=	gdk-pixbuf2
 PIXBUF_USES=		gettext gnome
 PIXBUF_USE=		gnome=glib20,gdkpixbuf
 
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 
 PYTHON_USES=		python
 PYTHON_USE=		python=py3kplist
 PYTHON_CONFIGURE_ENABLE=	python
 
+# avoid generating "*.cpython3*.opt-2.pyc" by -OO on byte compiling
+post-patch:
+	@${REINPLACE_CMD} -e '/PYTHON/ s|-OO|-O|' ${WRKSRC}/py-compile
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/graphics/libsixel/distinfo b/graphics/libsixel/distinfo
index 5190cbd1a92a..22ab81635a78 100644
--- a/graphics/libsixel/distinfo
+++ b/graphics/libsixel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1578938246
-SHA256 (libsixel-1.8.6.tar.gz) = 9f6dcaf40d250614ce0121b153949c327c46a958cfd2e47750d8788b7ed28e6a
-SIZE (libsixel-1.8.6.tar.gz) = 652377
+TIMESTAMP = 1785318608
+SHA256 (sixel-1.8.7-r2.tar.gz) = 9088475e5a1332f84b92ad46fd3c199ac56500c67f8a4054efccbc0db644bdba
+SIZE (sixel-1.8.7-r2.tar.gz) = 4372302