diff --git a/srcpkgs/xl2tpd/files/options.l2tp b/srcpkgs/xl2tpd/files/options.l2tp
deleted file mode 100644
index 425a56e0874..00000000000
--- a/srcpkgs/xl2tpd/files/options.l2tp
+++ /dev/null
@@ -1,17 +0,0 @@
-ipcp-accept-local
-ipcp-accept-remote
-ms-dns  192.168.1.1
-ms-dns  192.168.1.3
-ms-wins 192.168.1.2
-ms-wins 192.168.1.4
-noccp
-auth
-crtscts
-idle 1800
-mtu 1410
-mru 1410
-nodefaultroute
-debug
-lock
-proxyarp
-connect-delay 5000
diff --git a/srcpkgs/xl2tpd/template b/srcpkgs/xl2tpd/template
index 022522b075b..873a84908f5 100644
--- a/srcpkgs/xl2tpd/template
+++ b/srcpkgs/xl2tpd/template
@@ -1,7 +1,11 @@
 # Template file for 'xl2tpd'
 pkgname=xl2tpd
-version=1.3.12
+version=1.3.13
 revision=1
+build_style=gnu-makefile
+make_use_env=yes
+make_build_args="KERNELSRC=${XBPS_CROSS_BASE}/usr"
+make_install_args="SBINDIR=\$(BINDIR)"
 makedepends="libpcap-devel"
 short_desc="Open source implementation of the Layer 2 Tunnelling Protocol"
 maintainer="Duncaen <duncaen@voidlinux.eu>"
@@ -9,18 +13,14 @@ license="GPL-2.0-or-later"
 homepage="https://www.xelerance.com/services/software/xl2tpd/"
 #changelog="https://github.com/xelerance/xl2tpd/blob/master/CHANGES"
 distfiles="https://github.com/xelerance/xl2tpd/archive/v${version}.tar.gz"
-checksum=6f0ac50a76500d5cc56a67451b61e5f561b3309357176b39deabb1705e8745fd
+checksum=e76ac67f314d0e285364a42b3683eecbc77c6ebe48939478bc9d6faa79d7cc77
 
 conf_files="
- /etc/${pkgname}/${pkgname}.conf
+ /etc/xl2tpd/xl2tpd.conf
  /etc/ppp/options.l2tp"
 
-do_build() {
-	make LDFLAGS="${LDFLAGS}" KERNELSRC="${XBPS_CROSS_BASE}/usr" ${makejobs}
-}
-do_install() {
-	make DESTDIR="${DESTDIR}" PREFIX=/usr SBINDIR="${DESTDIR}/usr/bin" install
+post_install() {
 	vsv xl2tpd
 	vinstall examples/xl2tpd.conf 644 etc/xl2tpd
-	vinstall "${FILESDIR}/options.l2tp" 644 etc/ppp
+	vinstall examples/ppp-options.xl2tpd 644 etc/ppp options.l2tp
 }