diff --git a/devel/safe-iop/Makefile b/devel/safe-iop/Makefile
index a05bbad49c18..1d4919786095 100644
--- a/devel/safe-iop/Makefile
+++ b/devel/safe-iop/Makefile
@@ -1,29 +1,43 @@
 # Created by: stas
 
 PORTNAME=	safe-iop
-PORTVERSION=	0.3.1
-PORTREVISION=	1
+DISTVERSION=	0.3.2
 CATEGORIES=	devel
 MASTER_SITES=	https://BSDforge.com/projects/source/devel/safe-iop/
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	Safe integer operation library for C
 
-USES=		tar:tgz
+# XXX
+# I use BSD1CLAUSE as defined in /usr/src/include/ifaddrs.h
+# but bsd.licenses.db.mk only has
+# BSD BSD0CLAUSE BSD2CLAUSE BSD3CLAUSE BSD4CLAUSE - go figure
+# So fake it
+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
 USE_LDCONFIG=	yes
 ALL_TARGET=	so
 CFLAGS+=	-fPIC
+
 PLIST_FILES=	include/safe_iop.h \
-		lib/libsafe_iop.so.0
+		lib/libsafe_iop.so.0 \
+		%%DOCSDIR%%/README \
+		%%DOCSDIR%%/README.md \
+		%%EXAMPLESDIR%%/askme.c
 
-post-patch:
-	@${REINPLACE_CMD} -E -e 's,(^CC[[:space:]]*=.*),#\1,' \
-	    -e 's,(^CFLAGS[[:space:]]*)=.*,\1+= -Iinclude,' \
-	    -e 's,(^VERSION[[:space:]]*=[[:space:]]*[[:digit:]]+).*,\1,' \
-	    ${WRKSRC}/Makefile
+USE_GITLAB=	yes
+GL_ACCOUNT=	ports1
+GL_PROJECT=	safe-iop
+GL_COMMIT=	2b20d77fb9f22b1ec9e2b3d2eb53c532596d3203
 
 do-install:
 	${INSTALL_LIB} ${WRKSRC}/libsafe_iop.so.0 ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_DATA} ${WRKSRC}/include/safe_iop.h ${STAGEDIR}${PREFIX}/include
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/askme.c ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/safe-iop/distinfo b/devel/safe-iop/distinfo
index 068fdb43e574..ee3c393d65d6 100644
--- a/devel/safe-iop/distinfo
+++ b/devel/safe-iop/distinfo
@@ -1,2 +1,4 @@
-SHA256 (safe-iop-0.3.1.tgz) = 96027e1512dc463f8418e0ba89f8c39a4bfe36cf2456c9afbf1b3897b4e9cf76
-SIZE (safe-iop-0.3.1.tgz) = 11515
+TIMESTAMP = 1623347535
+SHA256 (ports1-safe-iop-2b20d77fb9f22b1ec9e2b3d2eb53c532596d3203_GL0.tar.gz) = bfe8453159c04e3aa6ad107407212a671d20693dd9592a1b88a54e6e9fc019f5
+SHA512 (ports1-safe-iop-2b20d77fb9f22b1ec9e2b3d2eb53c532596d3203_GL0.tar.gz) = 21fc2022d22c622a73a3931de86a391d111ae008e03d38ecde96dd0d193b40c64514596a47cc7dee22a75f00f03e5e231858177fe60260b7c83e85c0f162023a
+SIZE (ports1-safe-iop-2b20d77fb9f22b1ec9e2b3d2eb53c532596d3203_GL0.tar.gz) = 12428
diff --git a/devel/safe-iop/pkg-descr b/devel/safe-iop/pkg-descr
index c7b4a811f571..25a082a16d21 100644
--- a/devel/safe-iop/pkg-descr
+++ b/devel/safe-iop/pkg-descr
@@ -4,11 +4,11 @@ with a straightforward API.
 
 It supports two modes of use: header-only and linked dynamic library.
 The linked, dynamic library supplies a format-string based interface
-which is in pre-alpha.  The header-only mode supplies integer and sign
+which is in pre-alpha. The header-only mode supplies integer and sign
 overflow and underflow pre-condition checks using checks derived from
-the CERT secure coding guide.  The checks do not rely on twos complement
+the CERT secure coding guide. The checks do not rely on twos complement
 arithmetic and should not at any point perform an arithmetic operations
-that may overflow.  It also performs basic type agreement checks to
+that may overflow. It also performs basic type agreement checks to
 ensure that the macros are being used (somewhat) correctly.
 
-WWW: https://BSDforge.com/projects/devel/safe-iop/
+WWW: https://gitlab.com/ports1/safe-iop/