diff --git a/recipes-apps/tasks/task-sysmocom-debug.bb b/recipes-apps/tasks/task-sysmocom-debug.bb
index 2749558..fd2744a 100644
--- a/recipes-apps/tasks/task-sysmocom-debug.bb
+++ b/recipes-apps/tasks/task-sysmocom-debug.bb
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = " \
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 DEPENDS = "virtual/kernel"
 ALLOW_EMPTY_${PN} = "1"
-PR = "r4"
+PR = "r5"
 
 RDEPENDS_${PN} = "\
     dropbear \
@@ -14,5 +14,6 @@ RDEPENDS_${PN} = "\
     gdb \
     gdbserver \
     net-tools \
+    n2n \
     "
 
diff --git a/recipes-extra/n2n/n2n/0001-Makefile-Allow-cross-compilation-environment-to-spec.patch b/recipes-extra/n2n/n2n/0001-Makefile-Allow-cross-compilation-environment-to-spec.patch
new file mode 100644
index 0000000..8952773
--- /dev/null
+++ b/recipes-extra/n2n/n2n/0001-Makefile-Allow-cross-compilation-environment-to-spec.patch
@@ -0,0 +1,25 @@
+From d6bd89581ac104a56441f63ca4a8f2139917f9f6 Mon Sep 17 00:00:00 2001
+From: Harald Welte <laforge@gnumonks.org>
+Date: Mon, 10 Jul 2017 13:58:58 +0200
+Subject: [PATCH] Makefile: Allow cross-compilation environment to specify CC
+
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index b670978..9af3c99 100644
+--- a/Makefile
++++ b/Makefile
+@@ -4,7 +4,7 @@ N2N_OSNAME=$(shell uname -p)
+ 
+ ########
+ 
+-CC=gcc
++CC?=gcc
+ DEBUG?=-g3
+ #OPTIMIZATION?=-O2
+ WARN?=-Wall -Wshadow -Wpointer-arith -Wmissing-declarations -Wnested-externs
+-- 
+2.11.0
+
diff --git a/recipes-extra/n2n/n2n_git.bb b/recipes-extra/n2n/n2n_git.bb
new file mode 100644
index 0000000..589f1b8
--- /dev/null
+++ b/recipes-extra/n2n/n2n_git.bb
@@ -0,0 +1,35 @@
+SUMMARY = "n2n is a peer-to-peer L2-over-L3 VPN"
+HOMEPAGE = "https://github.com/ntop/n2n"
+LICENSE = "GPLv3+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=d2dd9497ff2aa79327dc88b6ce2b03cc"
+DEPENDS = "openssl"
+PV = "2.1.0+git${SRCPV}"
+
+PR="r1"
+
+SRC_URI = "git://github.com/ntop/n2n.git;branch=master \
+	   file://0001-Makefile-Allow-cross-compilation-environment-to-spec.patch"
+SRCREV= "${AUTOREV}"
+S = "${WORKDIR}/git"
+
+do_compile() {
+	CFLAGS="$CFLAGS $LDFLAGS"
+	oe_runmake 
+}
+
+do_install() {
+	oe_runmake install DESTDIR=${D}
+}
+
+#PACKAGES += "n2n-edge n2n-supernode"
+#
+#FILES_n2n_edge = "\
+#	${sbindir}/edge \
+#	${mandir}/man8/edge.8.gz \
+#	"
+#
+#FILES_n2n_supernode = "\
+#	${sbindir}/supernode \
+#	${mandir}/man1/supernode.1.gz \
+#	${mandir}/man7/n2n_v2.7.gz \
+#	"