diff --git a/package/Config.in b/package/Config.in
index 3da201a41b..7412ba663a 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -1240,6 +1240,7 @@ endif
 	source "package/hostapd/Config.in"
 	source "package/hplip/Config.in"
 	source "package/httping/Config.in"
+	source "package/ibrdtnd/Config.in"
 if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 	source "package/ifplugd/Config.in"
 endif
diff --git a/package/ibrdtnd/Config.in b/package/ibrdtnd/Config.in
new file mode 100644
index 0000000000..f7f371edfd
--- /dev/null
+++ b/package/ibrdtnd/Config.in
@@ -0,0 +1,15 @@
+config BR2_PACKAGE_IBRDTND
+	bool "ibrdtnd"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	select BR2_PACKAGE_IBRDTN
+	select BR2_PACKAGE_IBRCOMMON
+	help
+	  IBR-DTN is a small dtn application that supports:
+	  Bundle Protocol RFC 5050
+	  Bundle Security Protocol RFC 6257
+
+	  http://trac.ibr.cs.tu-bs.de/project-cm-2012-ibrdtn
+
+comment "ibrdtnd needs a toolchain w/ C++, threads"
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/ibrdtnd/ibrdtnd.hash b/package/ibrdtnd/ibrdtnd.hash
new file mode 100644
index 0000000000..4b7dd7c3d8
--- /dev/null
+++ b/package/ibrdtnd/ibrdtnd.hash
@@ -0,0 +1,2 @@
+# Locally calculated
+sha256	  9bd79636154093ab6bf4fd10d6c62d67c6db45141460847b19def327c93771ed	ibrdtnd-1.0.1.tar.gz
diff --git a/package/ibrdtnd/ibrdtnd.mk b/package/ibrdtnd/ibrdtnd.mk
new file mode 100644
index 0000000000..8a37fa335c
--- /dev/null
+++ b/package/ibrdtnd/ibrdtnd.mk
@@ -0,0 +1,49 @@
+################################################################################
+#
+# ibrdtnd
+#
+################################################################################
+
+IBRDTND_VERSION = 1.0.1
+IBRDTND_SOURCE = ibrdtnd-$(IBRDTND_VERSION).tar.gz
+IBRDTND_SITE = https://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/
+IBRDTND_LICENSE = Apache-2.0
+IBRDTND_LICENSE_FILES = COPYING
+IBRDTND_DEPENDENCIES = ibrdtn ibrcommon
+
+# Disable features that don't have the necessary dependencies in
+# Buildroot
+IBRDTND_CONF_OPTS = \
+	--disable-dtndht \
+	--without-wifip2p \
+	--without-vmime
+
+ifeq ($(BR2_PACKAGE_LIBDAEMON),y)
+IBRDTND_CONF_OPTS += --enable-libdaemon
+IBRDTND_DEPENDENCIES += libdaemon
+else
+IBRDTND_CONF_OPTS += --disable-libdaemon
+endif
+
+ifeq ($(BR2_PACKAGE_LIBCURL),y)
+IBRDTND_CONF_OPTS += --with-curl
+IBRDTND_DEPENDENCIES += libcurl
+else
+IBRDTND_CONF_OPTS += --without-curl
+endif
+
+ifeq ($(BR2_PACKAGE_SQLITE),y)
+IBRDTND_CONF_OPTS += --with-sqlite
+IBRDTND_DEPENDENCIES += sqlite
+else
+IBRDTND_CONF_OPTS += --without-sqlite
+endif
+
+ifeq ($(BR2_PACKAGE_OPENSSL),y)
+IBRDTND_CONF_OPTS += --with-tls
+IBRDTND_DEPENDENCIES += openssl
+else
+IBRDTND_CONF_OPTS += --without-tls
+endif
+
+$(eval $(autotools-package))