diff --git a/sysutils/bastille/Makefile b/sysutils/bastille/Makefile
index 4a2fc9d45167..30be1809cf47 100644
--- a/sysutils/bastille/Makefile
+++ b/sysutils/bastille/Makefile
@@ -1,39 +1,41 @@
 PORTNAME=	bastille
-DISTVERSION=	1.2.2.251204
+DISTVERSION=	1.3.0.251222
 CATEGORIES=	sysutils
 MAINTAINER=	jdhurtado@orbiware.com
 # co-maintainer: snarfingcode666@gmail.com
 COMMENT=	Jail automation framework
 WWW=		https://bastillebsd.org
 
+PATCH_SITES=	https://github.com/michael-o/bastille/commit/
+PATCHFILES=		2ddb02f90a907075a41f41fc1ea861f83178acee.patch:-p1
+
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	bastillebsd
+GH_ACCOUNT=	BastilleBSD
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 
 post-patch:
+	@${FIND} ${WRKSRC} -name *.orig -delete
 	@${REINPLACE_CMD} \
 		-e 's|/usr/local/etc/bastille|${ETCDIR}|g' \
 		-e 's|/usr/local|${PREFIX}|g' \
 		${WRKSRC}/usr/local/etc/rc.d/bastille
 
 do-install:
+	${MKDIR} ${STAGEDIR}${ETCDIR}
+	${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/usr/local/bin/bastille ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/usr/local/etc/bastille/bastille.conf.sample \
+		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 	${INSTALL_SCRIPT} ${WRKSRC}/usr/local/etc/rc.d/bastille \
 		${STAGEDIR}${PREFIX}/etc/rc.d
-
-post-install:
-	${MKDIR} ${STAGEDIR}${ETCDIR}
-	${MKDIR} ${STAGEDIR}${DATADIR}
 	(cd ${WRKSRC}/usr/local/share/bastille && \
 		${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR})
-	${INSTALL_MAN} ${WRKSRC}/usr/local/share/man/man8/bastille.8 \
-		${STAGEDIR}${PREFIX}/share/man/man8/${PORTNAME}.8
-	${INSTALL_DATA} ${WRKSRC}/usr/local/etc/bastille/bastille.conf.sample \
-		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
+	(cd ${WRKSRC}/usr/local/share/man && \
+		${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/man)
 
 .include <bsd.port.mk>
diff --git a/sysutils/bastille/distinfo b/sysutils/bastille/distinfo
index 213783f28a5f..d5b0448be74a 100644
--- a/sysutils/bastille/distinfo
+++ b/sysutils/bastille/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1764866943
-SHA256 (bastillebsd-bastille-1.2.2.251204_GH0.tar.gz) = f8bb0d02601648833a4563f7b324235c169dd6968037fd2b518d6d9b4645733e
-SIZE (bastillebsd-bastille-1.2.2.251204_GH0.tar.gz) = 707979
+TIMESTAMP = 1766524167
+SHA256 (BastilleBSD-bastille-1.3.0.251222_GH0.tar.gz) = 49fe923c605e5c1565ef06487c23ad7d12766b3130aa45fdab3efb366172c725
+SIZE (BastilleBSD-bastille-1.3.0.251222_GH0.tar.gz) = 721723
+SHA256 (2ddb02f90a907075a41f41fc1ea861f83178acee.patch) = d5a38907d7a624ee328c110f7dcb4721b71932831daa99ac271ab71099e88ca2
+SIZE (2ddb02f90a907075a41f41fc1ea861f83178acee.patch) = 25086
diff --git a/sysutils/bastille/pkg-plist b/sysutils/bastille/pkg-plist
index 326ed377ebf8..46771eab1139 100644
--- a/sysutils/bastille/pkg-plist
+++ b/sysutils/bastille/pkg-plist
@@ -1,54 +1,95 @@
 @sample %%ETCDIR%%/bastille.conf.sample
 bin/bastille
 etc/rc.d/bastille
 %%DATADIR%%/bootstrap.sh
 %%DATADIR%%/clone.sh
 %%DATADIR%%/cmd.sh
 %%DATADIR%%/colors.pre.sh
 %%DATADIR%%/common.sh
 %%DATADIR%%/config.sh
 %%DATADIR%%/console.sh
 %%DATADIR%%/convert.sh
 %%DATADIR%%/cp.sh
 %%DATADIR%%/create.sh
 %%DATADIR%%/destroy.sh
 %%DATADIR%%/edit.sh
 %%DATADIR%%/etcupdate.sh
 %%DATADIR%%/export.sh
 %%DATADIR%%/htop.sh
 %%DATADIR%%/import.sh
 %%DATADIR%%/jcp.sh
 %%DATADIR%%/limits.sh
 %%DATADIR%%/list.sh
 %%DATADIR%%/migrate.sh
+%%DATADIR%%/monitor.sh
 %%DATADIR%%/mount.sh
 %%DATADIR%%/network.sh
 %%DATADIR%%/pkg.sh
-%%DATADIR%%/pkgbase/FreeBSD-base.conf
 %%DATADIR%%/rcp.sh
 %%DATADIR%%/rdr.sh
 %%DATADIR%%/rename.sh
 %%DATADIR%%/restart.sh
 %%DATADIR%%/service.sh
 %%DATADIR%%/setup.sh
 %%DATADIR%%/start.sh
 %%DATADIR%%/stop.sh
 %%DATADIR%%/sysrc.sh
 %%DATADIR%%/tags.sh
 %%DATADIR%%/template.sh
+%%DATADIR%%/top.sh
+%%DATADIR%%/umount.sh
+%%DATADIR%%/update.sh
+%%DATADIR%%/upgrade.sh
+%%DATADIR%%/verify.sh
+%%DATADIR%%/zfs.sh
+%%DATADIR%%/pkgbase/FreeBSD-base.conf
 %%DATADIR%%/templates/default/base/Bastillefile
 %%DATADIR%%/templates/default/clone/Bastillefile
 %%DATADIR%%/templates/default/empty/Bastillefile
 %%DATADIR%%/templates/default/linux/Bastillefile
 %%DATADIR%%/templates/default/thick/Bastillefile
 %%DATADIR%%/templates/default/thin/Bastillefile
 %%DATADIR%%/templates/default/vlan/Bastillefile
 %%DATADIR%%/templates/default/vnet/Bastillefile
-%%DATADIR%%/top.sh
-%%DATADIR%%/umount.sh
-%%DATADIR%%/update.sh
-%%DATADIR%%/upgrade.sh
-%%DATADIR%%/verify.sh
-%%DATADIR%%/zfs.sh
 share/man/man8/bastille.8.gz
+share/man/man8/bastille-bootstrap.8.gz
+share/man/man8/bastille-clone.8.gz
+share/man/man8/bastille-cmd.8.gz
+share/man/man8/bastille-config.8.gz
+share/man/man8/bastille-console.8.gz
+share/man/man8/bastille-convert.8.gz
+share/man/man8/bastille-cp.8.gz
+share/man/man8/bastille-create.8.gz
+share/man/man8/bastille-destroy.8.gz
+share/man/man8/bastille-edit.8.gz
+share/man/man8/bastille-etcupdate.8.gz
+share/man/man8/bastille-export.8.gz
+share/man/man8/bastille-htop.8.gz
+share/man/man8/bastille-import.8.gz
+share/man/man8/bastille-jcp.8.gz
+share/man/man8/bastille-limits.8.gz
+share/man/man8/bastille-list.8.gz
+share/man/man8/bastille-migrate.8.gz
+share/man/man8/bastille-monitor.8.gz
+share/man/man8/bastille-mount.8.gz
+share/man/man8/bastille-network.8.gz
+share/man/man8/bastille-pkg.8.gz
+share/man/man8/bastille-rcp.8.gz
+share/man/man8/bastille-rdr.8.gz
+share/man/man8/bastille-rename.8.gz
+share/man/man8/bastille-restart.8.gz
+share/man/man8/bastille-service.8.gz
+share/man/man8/bastille-setup.8.gz
+share/man/man8/bastille-start.8.gz
+share/man/man8/bastille-stop.8.gz
+share/man/man8/bastille-sysrc.8.gz
+share/man/man8/bastille-tags.8.gz
+share/man/man8/bastille-template.8.gz
+share/man/man8/bastille-top.8.gz
+share/man/man8/bastille-umount.8.gz
+share/man/man8/bastille-update.8.gz
+share/man/man8/bastille-upgrade.8.gz
+share/man/man8/bastille-verify.8.gz
+share/man/man8/bastille-zfs.8.gz
+share/man/man5/bastille.conf.5.gz
 @dir %%ETCDIR%%