diff --git a/srcpkgs/burp-client b/srcpkgs/burp-client
new file mode 120000
index 00000000000..47843b7b980
--- /dev/null
+++ b/srcpkgs/burp-client
@@ -0,0 +1 @@
+burp-server
\ No newline at end of file
diff --git a/srcpkgs/burp-server/files/burp-server/run b/srcpkgs/burp-server/files/burp-server/run
new file mode 100755
index 00000000000..14e3188c6f0
--- /dev/null
+++ b/srcpkgs/burp-server/files/burp-server/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec burp -F -c /etc/burp/burp-server.conf
diff --git a/srcpkgs/burp-server/patches/00.burp_ca.patch b/srcpkgs/burp-server/patches/00.burp_ca.patch
new file mode 100644
index 00000000000..a60ddb08218
--- /dev/null
+++ b/srcpkgs/burp-server/patches/00.burp_ca.patch
@@ -0,0 +1,13 @@
+# "-f" option unsupported by hostname.
+# from package VoidLinux/coreutils 8.24_3 - 2015-09.
+--- configs/certs/CA/burp_ca
++++ configs/certs/CA/burp_ca
+@@ -11,7 +11,7 @@
+ dir=${etc}/CA
+ conf=${etc}/CA.cnf
+ 
+-name=$(hostname -f)
++name=$(hostname)
+ ca_days=7300
+ size=2048
+ 
diff --git a/srcpkgs/burp-server/template b/srcpkgs/burp-server/template
new file mode 100644
index 00000000000..c38958948c5
--- /dev/null
+++ b/srcpkgs/burp-server/template
@@ -0,0 +1,66 @@
+# Template file for 'burp-server'
+_desc="A network-based backup and restore program"
+
+pkgname=burp-server
+version=1.4.40
+revision=1
+short_desc="${_desc} - Server"
+maintainer="Pierre Bourgin <pierre.bourgin@free.fr>"
+license="AGPL-3, BSD, GPL-2.1 and LGPL-2.1"
+homepage="http://burp.grke.org/"
+wrksrc="burp-${version}"
+distfiles="https://github.com/grke/burp/archive/${version}.tar.gz>${pkgname}-${version}.tar.gz"
+checksum=2e6a9a28453a11f3e36d0beefa185e72e7781a8718b55d3101144c9900752d6f
+
+hostmakedepends="automake libtool perl"
+# note: burp provides its internal copy of "uthash-devel"
+makedepends="
+ libressl-devel zlib-devel librsync-devel ncurses-devel
+ acl-devel yajl-devel"
+
+# unique binary for both client and server: server depends on client package.
+depends="burp-client-${version}_${revision}"
+
+build_style=gnu-configure
+configure_args="--sysconfdir=/etc/burp
+--sbindir=/usr/bin"
+conf_files="/etc/burp/burp-server.conf"
+
+post_install() {
+	vsv ${pkgname}
+
+	vdoc "README"
+	vdoc "UPGRADING"
+	vlicense "LICENSE"
+
+	# /usr/sbin/burp_ca is hardcoded in conf files
+	sed -e "s,/usr/sbin/burp_ca,/usr/bin/burp_ca,g" \
+	    -i ${DESTDIR}/etc/burp/burp-server.conf
+
+	# storage folder
+	touch -f ${PKGDESTDIR}/var/spool/burp/.empty_on_purpose
+}
+
+burp-client_package() {
+	short_desc="${_desc} - client"
+	# openssl binary needed by burp_ca script
+	depends="openssl"
+	conf_files="/etc/burp/burp.conf"
+	pkg_install() {
+		vmove "usr/bin/burp"
+		vmove "usr/bin/burp_ca"
+		vmove "usr/share/man/man8/burp.8.gz"
+		vmove "usr/share/man/man8/burp_ca.8.gz"
+		vmove "etc/burp/CA-client"
+		vmove "etc/burp/burp.conf"
+		vdoc "README"
+		vlicense "LICENSE"
+
+		# /usr/sbin/burp_ca is hardcoded in conf files
+		sed -e "s,/usr/sbin/burp_ca,/usr/bin/burp_ca,g" \
+		    -i ${PKGDESTDIR}/etc/burp/burp.conf
+
+		# burp_ca requires directory CA-client
+		touch -f ${PKGDESTDIR}/etc/burp/CA-client/.empty_on_purpose
+	}
+}
diff --git a/srcpkgs/burp-server/update b/srcpkgs/burp-server/update
new file mode 100644
index 00000000000..76424b2f623
--- /dev/null
+++ b/srcpkgs/burp-server/update
@@ -0,0 +1,2 @@
+# ignore v2 version for the moment, not yet stable
+ignore="2.*"