diff --git a/sysutils/bvm/Makefile b/sysutils/bvm/Makefile
index 58bb62823fb6..57f303cb4634 100644
--- a/sysutils/bvm/Makefile
+++ b/sysutils/bvm/Makefile
@@ -1,36 +1,37 @@
 PORTNAME=	bvm
-DISTVERSION=	1.3.5
+DISTVERSION=	1.4.0
 CATEGORIES=	sysutils
 
 MAINTAINER=	bigdragonsoft@gmail.com
 COMMENT=	Bhyve VM Manager
 WWW=		https://github.com/bigdragonsoft/bvm
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	Bhyve VM Manager is required to be built on a 64bit machine
 
 RUN_DEPENDS=	bhyve-firmware>0:sysutils/bhyve-firmware \
 		grub-bhyve:sysutils/grub2-bhyve \
+		swtpm:sysutils/swtpm \
 		tmux:sysutils/tmux
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	bigdragonsoft
 
 BUILD_WRKSRC=	${WRKSRC}/src
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/bvm
-	${INSTALL_DATA} ${WRKSRC}/conf/bvm.conf ${STAGEDIR}${PREFIX}/etc/bvm/bvm.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/conf/nat.conf ${STAGEDIR}${PREFIX}/etc/bvm/nat.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/conf/switch.conf ${STAGEDIR}${PREFIX}/etc/bvm/switch.conf.sample
-	${INSTALL_DATA} ${WRKSRC}/conf/dhcp.conf ${STAGEDIR}${PREFIX}/etc/bvm/dhcp.conf.sample
-	${INSTALL_SCRIPT} ${WRKSRC}/conf/bvmd ${STAGEDIR}${PREFIX}/etc/rc.d/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/bvm ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/bvmb ${STAGEDIR}${PREFIX}/bin/
-	${INSTALL_PROGRAM} ${WRKSRC}/src/bvmdhcp ${STAGEDIR}${PREFIX}/bin/
+	${MKDIR} ${STAGEDIR}${ETCDIR}/templates
+.for _CONF in bvm.conf dhcp.conf nat.conf switch.conf \
+	templates/freebsd.conf templates/linux.conf templates/windows.conf
+	${INSTALL_DATA} ${WRKSRC}/conf/${_CONF} ${STAGEDIR}${ETCDIR}/${_CONF}.sample
+.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/conf/bvmd ${STAGEDIR}${PREFIX}/etc/rc.d
+	${INSTALL_PROGRAM} ${WRKSRC}/src/bvm \
+		${WRKSRC}/src/bvmb \
+		${WRKSRC}/src/bvmdhcp ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/bvm.8 ${STAGEDIR}${PREFIX}/share/man/man8
 
 .include <bsd.port.mk>
diff --git a/sysutils/bvm/distinfo b/sysutils/bvm/distinfo
index dab786e2417c..6d414c69659b 100644
--- a/sysutils/bvm/distinfo
+++ b/sysutils/bvm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1733565574
-SHA256 (bigdragonsoft-bvm-1.3.5_GH0.tar.gz) = 6c0afb98905c685e35b00719959f888eb61979d6e1bb5434a99da2ae0c0e3733
-SIZE (bigdragonsoft-bvm-1.3.5_GH0.tar.gz) = 139958
+TIMESTAMP = 1766972604
+SHA256 (bigdragonsoft-bvm-1.4.0_GH0.tar.gz) = 7f2c5541bf703a6c8f59dac5652a9ec9d8224b85a85de0f416740d8bf24f8216
+SIZE (bigdragonsoft-bvm-1.4.0_GH0.tar.gz) = 176925
diff --git a/sysutils/bvm/pkg-descr b/sysutils/bvm/pkg-descr
index 34744c164dd7..b5ca16dc8f1c 100644
--- a/sysutils/bvm/pkg-descr
+++ b/sysutils/bvm/pkg-descr
@@ -1,9 +1,10 @@
-The BVM is a Bhyve virtual machine management tool
-based on FreeBSD that allows you to easily manage virtual machines.
+BVM is a powerful and easy-to-use command-line manager for Bhyve VM on FreeBSD.
 
-1. The supported operating systems are:
-   FreeBSD,OpenBSD,NetBSD,Debian,OpenSuse,Ubuntu Windows10 etc.
-2. Supports multiple network cards and multiple hard disks.
-3. There are two kinds of network modes: Bridged and NAT
-4. Support grub and uefi boot
-5. Support for ZFS
+Main features include:
+- Wide OS support: FreeBSD, OpenBSD, NetBSD, Linux, and Windows 10/11.
+- Flexible storage/network: Supports VirtIO/NVMe, ZFS snapshots, NAT with
+  port forwarding, bridging, and built-in DHCP.
+- Advanced capabilities: Supports UEFI (with persistence), TPM 2.0, PCI
+  passthrough, and VirtIO-9P shared folders.
+- Management tools: VNC remote access, VM encryption, CPU topology control,
+  autoboot configuration, and snapshot rollback.
diff --git a/sysutils/bvm/pkg-plist b/sysutils/bvm/pkg-plist
index a0a90e05d19c..312af9dc4942 100644
--- a/sysutils/bvm/pkg-plist
+++ b/sysutils/bvm/pkg-plist
@@ -1,9 +1,12 @@
 bin/bvm
 bin/bvmb
 bin/bvmdhcp
 @sample %%ETCDIR%%/bvm.conf.sample
+@sample %%ETCDIR%%/dhcp.conf.sample
 @sample %%ETCDIR%%/nat.conf.sample
 @sample %%ETCDIR%%/switch.conf.sample
-@sample %%ETCDIR%%/dhcp.conf.sample
+@sample %%ETCDIR%%/templates/freebsd.conf.sample
+@sample %%ETCDIR%%/templates/linux.conf.sample
+@sample %%ETCDIR%%/templates/windows.conf.sample
 etc/rc.d/bvmd
 share/man/man8/bvm.8.gz