diff --git a/sysutils/iocell/Makefile b/sysutils/iocell/Makefile
index 18b5b900d96c..8f8d6ea0b1c5 100644
--- a/sysutils/iocell/Makefile
+++ b/sysutils/iocell/Makefile
@@ -1,36 +1,40 @@
 # Created by: Bartek Rutkowski <robak@FreeBSD.org>
 
 PORTNAME=	iocell
 PORTVERSION=	2.1.2
 DISTVERSIONPREFIX=v
+PORTREVISION=	1
 CATEGORIES=	sysutils
 
+PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/pull/
+PATCHFILES+=	37.patch:-p1 # https://github.com/bartekrutkowski/iocell/pull/37
+
 MAINTAINER=	robak@FreeBSD.org
 COMMENT=	Feature rich Jail containers manager (iocage fork)
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	uclcmd:devel/uclcmd
 
 CONFLICTS=	iocage-*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bartekrutkowski
 
 NO_BUILD=	yes
-NO_ARCH=	yes
 
 post-patch:
+	@${REINPLACE_CMD} -e "s|amd64|${MACHINE}|g" ${WRKSRC}/lib/ioc-*
 	@${REINPLACE_CMD} -e "s|/usr/local/lib/iocell|${PREFIX}/lib/iocell|g" ${WRKSRC}/iocell
 
 pre-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/iocell
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/rc.d/iocell ${STAGEDIR}${PREFIX}/etc/rc.d
 	${INSTALL_SCRIPT} ${WRKSRC}/iocell ${STAGEDIR}${PREFIX}/sbin
 	(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/iocell)
 	${INSTALL_MAN} ${WRKSRC}/iocell.8 ${STAGEDIR}${PREFIX}/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/iocell/distinfo b/sysutils/iocell/distinfo
index c4d599c536d4..168b66468bb5 100644
--- a/sysutils/iocell/distinfo
+++ b/sysutils/iocell/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1529540233
+TIMESTAMP = 1613421536
 SHA256 (bartekrutkowski-iocell-v2.1.2_GH0.tar.gz) = 36f98ec1f55f444913bb5154b51549e85fb34e04e372d4fe34bb8be2c5f7ed36
 SIZE (bartekrutkowski-iocell-v2.1.2_GH0.tar.gz) = 372737
+SHA256 (37.patch) = 9bacb2e7fa1b6de7dac753d23594087951733968f1723501096cb71131e811e8
+SIZE (37.patch) = 4538