diff --git a/build-scripts/compile-options b/build-scripts/compile-options
index 11b091805..d2193706d 100644
--- a/build-scripts/compile-options
+++ b/build-scripts/compile-options
@@ -129,6 +129,7 @@ esac
 
 var_append DEPS "libxml2 libyaml"
 var_append DEPS "diffutils"
+var_append DEPS "leech"
 
 # LDAP functions in the agent
 # and LDAP authentication functionality in Mission Portal
diff --git a/deps-packaging/leech/cfbuild-leech.spec b/deps-packaging/leech/cfbuild-leech.spec
new file mode 100644
index 000000000..882fd554d
--- /dev/null
+++ b/deps-packaging/leech/cfbuild-leech.spec
@@ -0,0 +1,70 @@
+%define leech_version 0.1.20
+
+Summary: CFEngine Build Automation -- leech
+Name: cfbuild-leech
+Version: %{version}
+Release: 1
+Source0: leech-%{leech_version}.tar.gz
+License: MIT
+Group: Other
+Url: http://example.com/
+BuildRoot: %{_topdir}/BUILD/%{name}-%{version}-%{release}-buildroot
+
+AutoReqProv: no
+
+%define prefix %{buildprefix}
+
+%prep
+mkdir -p %{_builddir}
+%setup -q -n leech-%{leech_version}
+
+# Touch this file, or else autoreconf is called for some reason
+touch config.h.in
+./configure --prefix=%{prefix}
+
+%build
+
+make
+
+%install
+rm -rf ${RPM_BUILD_ROOT}
+
+make install DESTDIR=${RPM_BUILD_ROOT}
+
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.a
+rm -rf ${RPM_BUILD_ROOT}%{prefix}/lib/*.la
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%package devel
+Summary: CFEngine Build Automation -- leech -- development files
+Group: Other
+AutoReqProv: no
+
+%description
+CFEngine Build Automation -- leech
+
+%description devel
+CFEngine Build Automation -- leech -- development files
+
+%files
+%defattr(-,root,root)
+
+%dir %prefix/lib
+%prefix/lib/*.so.*
+%prefix/lib/*.so
+
+%files devel
+%defattr(-,root,root)
+
+%prefix/include
+
+%dir %prefix/lib
+%prefix/lib/*.so
+
+%changelog
+
+
+
+
diff --git a/deps-packaging/leech/debian/cfbuild-leech-devel.install b/deps-packaging/leech/debian/cfbuild-leech-devel.install
new file mode 100644
index 000000000..fcabb82f2
--- /dev/null
+++ b/deps-packaging/leech/debian/cfbuild-leech-devel.install
@@ -0,0 +1,2 @@
+/var/cfengine/include
+/var/cfengine/lib/*.so
diff --git a/deps-packaging/leech/debian/cfbuild-leech.install b/deps-packaging/leech/debian/cfbuild-leech.install
new file mode 100644
index 000000000..86dc38f84
--- /dev/null
+++ b/deps-packaging/leech/debian/cfbuild-leech.install
@@ -0,0 +1 @@
+/var/cfengine/lib
diff --git a/deps-packaging/leech/debian/compat b/deps-packaging/leech/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/deps-packaging/leech/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/deps-packaging/leech/debian/control b/deps-packaging/leech/debian/control
new file mode 100644
index 000000000..9c7a6b255
--- /dev/null
+++ b/deps-packaging/leech/debian/control
@@ -0,0 +1,12 @@
+Source: cfbuild-leech
+Section: libs
+Priority: optional
+Maintainer: CFEngine Packager <packager@cfengine.com>
+Build-Depends: debhelper
+Standards-Version: 3.8.4
+
+Package: cfbuild-leech
+Section: libs
+Architecture: any
+Description: CFEngine Build Automation -- leech
+ CFEngine Build Automation -- leech
diff --git a/deps-packaging/leech/debian/copyright b/deps-packaging/leech/debian/copyright
new file mode 100644
index 000000000..e69de29bb
diff --git a/deps-packaging/leech/debian/rules b/deps-packaging/leech/debian/rules
new file mode 100755
index 000000000..e08c25d50
--- /dev/null
+++ b/deps-packaging/leech/debian/rules
@@ -0,0 +1,44 @@
+#!/usr/bin/make -f
+
+PREFIX=$(BUILDPREFIX)
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	./configure --prefix=$(PREFIX)
+	make
+
+	touch build-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/deps-packaging/leech/distfiles b/deps-packaging/leech/distfiles
new file mode 100644
index 000000000..a29cc1391
--- /dev/null
+++ b/deps-packaging/leech/distfiles
@@ -0,0 +1 @@
+b2b8b66dc3fb4f2e2b3b2850460b6f38718339c61a034f50a8a19f376a5b4e85  leech-0.1.20.tar.gz
diff --git a/deps-packaging/leech/hpux/build b/deps-packaging/leech/hpux/build
new file mode 100755
index 000000000..0e6092af9
--- /dev/null
+++ b/deps-packaging/leech/hpux/build
@@ -0,0 +1,28 @@
+#!/bin/sh -e
+
+# Options
+
+PREFIX=${BUILDPREFIX}
+
+TT=${BUILD_ROOT}/cfbuild-leech${PREFIX}
+TTD=${BUILD_ROOT}/cfbuild-leech-devel${PREFIX}
+
+# Build
+
+# Touch this file, or else autoreconf is called for some reason
+touch config.h.in
+./configure --prefix=$PREFIX
+gmake
+
+# Test
+
+# Install
+
+mkdir -p $TTD/lib
+mkdir -p $TTD/include
+gmake install prefix=${TTD}
+
+# Package
+
+mkdir -p ${TT}/lib
+mv ${TTD}/lib/*.so* ${TT}/lib
diff --git a/deps-packaging/leech/hpux/packages b/deps-packaging/leech/hpux/packages
new file mode 100644
index 000000000..3dffeb671
--- /dev/null
+++ b/deps-packaging/leech/hpux/packages
@@ -0,0 +1 @@
+cfbuild-leech cfbuild-leech-devel
diff --git a/deps-packaging/leech/mingw/debian/cfbuild-leech-mingw64-devel.install b/deps-packaging/leech/mingw/debian/cfbuild-leech-mingw64-devel.install
new file mode 100644
index 000000000..003f42caf
--- /dev/null
+++ b/deps-packaging/leech/mingw/debian/cfbuild-leech-mingw64-devel.install
@@ -0,0 +1,3 @@
+/var/cfengine/include
+/var/cfengine/lib/*.dll.a
+
diff --git a/deps-packaging/leech/mingw/debian/cfbuild-leech-mingw64.install b/deps-packaging/leech/mingw/debian/cfbuild-leech-mingw64.install
new file mode 100644
index 000000000..82b4f10bd
--- /dev/null
+++ b/deps-packaging/leech/mingw/debian/cfbuild-leech-mingw64.install
@@ -0,0 +1 @@
+/var/cfengine/bin/*.dll
diff --git a/deps-packaging/leech/mingw/debian/compat b/deps-packaging/leech/mingw/debian/compat
new file mode 100644
index 000000000..f599e28b8
--- /dev/null
+++ b/deps-packaging/leech/mingw/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/deps-packaging/leech/mingw/debian/control b/deps-packaging/leech/mingw/debian/control
new file mode 100644
index 000000000..69324a823
--- /dev/null
+++ b/deps-packaging/leech/mingw/debian/control
@@ -0,0 +1,18 @@
+Source: cfbuild-leech
+Section: libs
+Priority: optional
+Maintainer: CFEngine Packager <packager@cfengine.com>
+Build-Depends: debhelper
+Standards-Version: 3.8.4
+
+Package: cfbuild-leech-mingw64
+Section: libs
+Architecture: any
+Description: CFEngine Build Automation -- leech -- mingw64
+ CFEngine Build Automation -- leech -- mingw64
+
+Package: cfbuild-leech-mingw64-devel
+Section: libdevel
+Architecture: any
+Description: CFEngine Build Automation -- leech -- mingw64 -- development files
+ CFEngine Build Automation -- leech -- mingw64 -- development files
diff --git a/deps-packaging/leech/mingw/debian/copyright b/deps-packaging/leech/mingw/debian/copyright
new file mode 100644
index 000000000..e69de29bb
diff --git a/deps-packaging/leech/mingw/debian/rules b/deps-packaging/leech/mingw/debian/rules
new file mode 100755
index 000000000..83b2a5604
--- /dev/null
+++ b/deps-packaging/leech/mingw/debian/rules
@@ -0,0 +1,51 @@
+#!/usr/bin/make -f
+
+PREFIX=$(BUILDPREFIX)
+
+clean:
+	dh_testdir
+	dh_testroot
+
+	dh_clean
+
+build: build-stamp
+build-stamp:
+	dh_testdir
+
+	# Touch this file, or else autoreconf is called for some reason
+	touch config.h.in
+	./configure LDFLAGS="-Wl,-no-undefined" --host=$(DEB_HOST_GNU_TYPE) --prefix=$(PREFIX) \
+	    --enable-shared \
+	    --disable-static
+	make
+
+	touch build-stamp
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k
+	dh_installdirs
+
+	make install DESTDIR=$(CURDIR)/debian/tmp
+
+	rm -f $(CURDIR)/debian/tmp$(PREFIX)/lib/leech.a
+	rm -f $(CURDIR)/debian/tmp$(PREFIX)/lib/leech.la
+
+binary-indep: build install
+
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_install --sourcedir=debian/tmp
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/deps-packaging/leech/solaris/build b/deps-packaging/leech/solaris/build
new file mode 100755
index 000000000..13932a00e
--- /dev/null
+++ b/deps-packaging/leech/solaris/build
@@ -0,0 +1,33 @@
+#!/usr/xpg4/bin/sh -e
+
+# Options
+
+PREFIX=${BUILDPREFIX}
+
+TT=${BUILD_ROOT}/cfbuild-leech${PREFIX}
+TTD=${BUILD_ROOT}/cfbuild-leech-devel${PREFIX}
+
+# Patch
+# Solaris 8
+
+# Build
+
+# Touch this file, or else autoreconf is called for some reason
+touch config.h.in
+./configure --prefix=$PREFIX
+
+$MAKE
+
+# Test
+
+# Install
+
+mkdir -p $TTD/lib
+mkdir -p $TTD/include
+$MAKE install prefix=${TTD}
+
+# Package
+
+
+mkdir -p ${TT}/lib
+mv ${TTD}/lib/*.so* ${TT}/lib
diff --git a/deps-packaging/leech/solaris/packages b/deps-packaging/leech/solaris/packages
new file mode 100644
index 000000000..3dffeb671
--- /dev/null
+++ b/deps-packaging/leech/solaris/packages
@@ -0,0 +1 @@
+cfbuild-leech cfbuild-leech-devel
diff --git a/deps-packaging/leech/source b/deps-packaging/leech/source
new file mode 100644
index 000000000..c6ae6c33e
--- /dev/null
+++ b/deps-packaging/leech/source
@@ -0,0 +1 @@
+https://github.com/larsewi/leech/releases/download/v0.1.20-alpha/