diff --git a/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk
new file mode 100644
index 0000000000..5f05a78442
--- /dev/null
+++ b/packages/addons/addon-depends/vdr-plugins/vdr-plugin-ddci2/package.mk
@@ -0,0 +1,50 @@
+################################################################################
+# This file is part of LibreELEC - https://libreelec.tv
+# Copyright (C) 2017-present Team LibreELEC
+#
+# LibreELEC is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# (at your option) any later version.
+#
+# LibreELEC is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with LibreELEC. If not, see .
+################################################################################
+
+PKG_NAME="vdr-plugin-ddci2"
+PKG_VERSION="05dd988"
+PKG_SHA256="b8ed2787e9140eb00a68397eaeb14862ba88a6e73480dc3220a098faffb14833"
+PKG_ARCH="any"
+PKG_LICENSE="GPL"
+PKG_SITE="https://github.com/jasmin-j/vdr-plugin-ddci2"
+PKG_URL="https://github.com/jasmin-j/vdr-plugin-ddci2/archive/$PKG_VERSION.tar.gz"
+PKG_DEPENDS_TARGET="toolchain vdr"
+PKG_SECTION="multimedia"
+PKG_SHORTDESC="Support for stand alone CI by Digital Devices."
+PKG_LONGDESC="Support for stand alone CI by Digital Devices."
+PKG_TOOLCHAIN="manual"
+
+make_target() {
+ VDR_DIR=$(get_build_dir vdr)
+ export PKG_CONFIG_PATH=$VDR_DIR:$PKG_CONFIG_PATH
+ export CPLUS_INCLUDE_PATH=$VDR_DIR/include
+
+ make \
+ LIBDIR="." \
+ LOCDIR="./locale" \
+ all
+}
+
+post_make_target() {
+ VDR_DIR=$(get_build_dir vdr)
+ VDR_APIVERSION=`sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$/\1/p' $VDR_DIR/config.h`
+ LIB_NAME=lib${PKG_NAME/-plugin/}
+
+ cp --remove-destination $PKG_BUILD/${LIB_NAME}.so $PKG_BUILD/${LIB_NAME}.so.${VDR_APIVERSION}
+ $STRIP libvdr-*.so*
+}
diff --git a/packages/addons/service/vdr-addon/changelog.txt b/packages/addons/service/vdr-addon/changelog.txt
index 9a5b381ca7..7654f1abd3 100644
--- a/packages/addons/service/vdr-addon/changelog.txt
+++ b/packages/addons/service/vdr-addon/changelog.txt
@@ -1,5 +1,6 @@
107
- add robotv plugin
+- add DDCI2 plugin
- update VDR to 2.3.8
- update all addons
diff --git a/packages/addons/service/vdr-addon/package.mk b/packages/addons/service/vdr-addon/package.mk
index 340b1efc32..25cab23b3a 100644
--- a/packages/addons/service/vdr-addon/package.mk
+++ b/packages/addons/service/vdr-addon/package.mk
@@ -25,7 +25,9 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://libreelec.tv"
PKG_URL=""
-PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-dummydevice vdr-plugin-dvbapi vdr-plugin-eepg vdr-plugin-epgfixer vdr-plugin-epgsearch vdr-plugin-iptv vdr-plugin-live vdr-plugin-restfulapi vdr-plugin-robotv vdr-plugin-satip vdr-plugin-streamdev vdr-plugin-vnsiserver vdr-plugin-wirbelscan vdr-plugin-wirbelscancontrol vdr-plugin-xmltv2vdr"
+PKG_DEPENDS_TARGET="toolchain vdr vdr-plugin-ddci2 vdr-plugin-dummydevice vdr-plugin-dvbapi vdr-plugin-eepg vdr-plugin-epgfixer \
+ vdr-plugin-epgsearch vdr-plugin-iptv vdr-plugin-live vdr-plugin-restfulapi vdr-plugin-robotv vdr-plugin-satip \
+ vdr-plugin-streamdev vdr-plugin-vnsiserver vdr-plugin-wirbelscan vdr-plugin-wirbelscancontrol vdr-plugin-xmltv2vdr"
PKG_SECTION="service.multimedia"
PKG_SHORTDESC="VDR: a TV streaming server for Linux"
PKG_LONGDESC="VDR (2.3.x) is a TV streaming server for Linux supporting DVB-S/S2, DVB-C, DVB-T/T2, IPTV and SAT>IP"
@@ -81,6 +83,7 @@ addon() {
cp -PR $VDR_PLUGIN_EPGFIXER_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $VDR_PLUGIN_RESTFULAPI_DIR/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
cp -PR $(get_build_dir vdr-plugin-robotv)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
+ cp -PR $(get_build_dir vdr-plugin-ddci2)/libvdr*.so.* $ADDON_BUILD/$PKG_ADDON_ID/plugin
mkdir -p $ADDON_BUILD/$PKG_ADDON_ID/config/plugins/eepg
diff --git a/packages/addons/service/vdr-addon/source/bin/vdr.start b/packages/addons/service/vdr-addon/source/bin/vdr.start
index bcc9eb3128..160161a8aa 100644
--- a/packages/addons/service/vdr-addon/source/bin/vdr.start
+++ b/packages/addons/service/vdr-addon/source/bin/vdr.start
@@ -139,6 +139,9 @@ fi
if [ "$ENABLE_ROBOTV" == "true" ] ; then
VDR_ARG="$VDR_ARG -P robotv"
fi
+if [ "$ENABLE_DDCI2" == "true" ] ; then
+ VDR_ARG="$VDR_ARG -P ddci2"
+fi
if [ ! -d "$ADDON_HOME/epgimages" ]; then
mkdir -p "$ADDON_HOME/epgimages"
diff --git a/packages/addons/service/vdr-addon/source/resources/language/English/strings.xml b/packages/addons/service/vdr-addon/source/resources/language/English/strings.xml
index a8854ae592..f29d14b5e3 100644
--- a/packages/addons/service/vdr-addon/source/resources/language/English/strings.xml
+++ b/packages/addons/service/vdr-addon/source/resources/language/English/strings.xml
@@ -32,4 +32,5 @@
- listen on ip
- listen on port
Enable plugin: roboTV
+ Enable plugin: DDCI2
diff --git a/packages/addons/service/vdr-addon/source/resources/settings.xml b/packages/addons/service/vdr-addon/source/resources/settings.xml
index d90187db6f..80fbb30822 100644
--- a/packages/addons/service/vdr-addon/source/resources/settings.xml
+++ b/packages/addons/service/vdr-addon/source/resources/settings.xml
@@ -21,6 +21,7 @@
+