diff --git a/packages/addons/service/dispmanx_vnc/package.mk b/packages/addons/service/dispmanx_vnc/package.mk
index 985495d2c6..366793fe82 100644
--- a/packages/addons/service/dispmanx_vnc/package.mk
+++ b/packages/addons/service/dispmanx_vnc/package.mk
@@ -27,15 +27,15 @@ PKG_URL="https://github.com/patrikolausson/dispmanx_vnc/archive/$PKG_VERSION.tar
 PKG_DEPENDS_TARGET="toolchain libvncserver bcm2835-bootloader bcm2835-driver libconfig libressl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="VNC Server for Raspberry Pi"
-PKG_LONGDESC="VNC Server for Raspberry Pi using dispmanx"
+PKG_SHORTDESC="Raspberry Pi VNC: a Virtual Network Computing server for Raspberry Pi"
+PKG_LONGDESC="Raspberry Pi VNC ($PKG_VERSION) is a Virtual Network Computing (VNC) server for Raspberry Pi using dispmanx"
 PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Raspberry Pi VNC"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_ADDON_REPOVERSION="8.0"
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 pre_make_target() {
   export SYSROOT_PREFIX
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 01345e6320..d5f9060839 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -28,16 +28,14 @@ PKG_PRIORITY="optional"
 PKG_SECTION="service"
 PKG_SHORTDESC="Emby: a personal media server"
 PKG_LONGDESC="Emby ($PKG_VERSION) brings your home videos, music, and photos together, automatically converting and streaming your media on-the-fly to any device"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
+PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Emby (beta)"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
 PKG_ADDON_REQUIRES="tools.mono:0.0.0"
-
-PKG_AUTORECONF="no"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 unpack() {
   mkdir -p $PKG_BUILD
diff --git a/packages/addons/service/inadyn/package.mk b/packages/addons/service/inadyn/package.mk
index 9963bdef5b..3be71abd02 100644
--- a/packages/addons/service/inadyn/package.mk
+++ b/packages/addons/service/inadyn/package.mk
@@ -26,16 +26,16 @@ PKG_URL="ftp://troglobit.com/$PKG_NAME/$PKG_NAME-$PKG_VERSION.tar.xz"
 PKG_DEPENDS_TARGET="toolchain libressl"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="Inadyn, a small and simple DDNS client"
-PKG_LONGDESC="Inadyn is a small and simple DDNS client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail.com)"
+PKG_SHORTDESC="Inadyn: a small and simple Dynamic Domain Name System client"
+PKG_LONGDESC="Inadyn ($PKG_VERSION) is a small and simple Dynamic Domain Name System (DDNS) client with HTTPS support. It is commonly available in many GNU/Linux distributions, used in off-the-shelf routers and Internet gateways to automate the task of keeping your DNS record up to date with any IP address changes from your ISP. It can also be used in installations with redundant (backup) connections to the Internet."
+PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="Inadyn"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
-PKG_AUTORECONF="yes"
 PKG_CONFIGURE_OPTS_TARGET="--enable-openssl" # --sysconfdir is ineffective
 
 pre_configure_target() {
diff --git a/packages/addons/service/syncthing/package.mk b/packages/addons/service/syncthing/package.mk
index d0efb6065d..754bc7a887 100644
--- a/packages/addons/service/syncthing/package.mk
+++ b/packages/addons/service/syncthing/package.mk
@@ -26,17 +26,15 @@ PKG_URL="https://github.com/syncthing/syncthing/archive/v${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain go:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-
-PKG_SHORTDESC="Open Source Continuous File Synchronization"
-PKG_LONGDESC="Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
-PKG_ADDON_REPOVERSION="8.0"
+PKG_SHORTDESC="Syncthing: open source continuous file synchronization"
+PKG_LONGDESC="Syncthing ($PKG_VERSION) replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet."
+PKG_AUTORECONF="no"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Syncthing"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
-PKG_AUTORECONF="no"
+PKG_ADDON_REPOVERSION="8.0"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 configure_target() {
   go run build.go assets
diff --git a/packages/addons/service/tinc/package.mk b/packages/addons/service/tinc/package.mk
index d3a5c4c624..76cac35a1d 100644
--- a/packages/addons/service/tinc/package.mk
+++ b/packages/addons/service/tinc/package.mk
@@ -26,16 +26,15 @@ PKG_URL="${PKG_SITE}/packages/$PKG_NAME-$PKG_VERSION.tar.gz"
 PKG_DEPENDS_TARGET="toolchain libressl lzo zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="service/system"
-PKG_SHORTDESC="tinc Virtual Private Network Daemon"
-PKG_LONGDESC="tinc is a virtual private network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
-
+PKG_SHORTDESC="tinc: a Virtual Private Network daemon"
+PKG_LONGDESC="tinc ($PKG_VERSION) is a Virtual Private Network (VPN) daemon that uses tunnelling and encryption to create a secure private network between hosts on the Internet. Because the VPN appears to the IP level network code as a normal network device, there is no need to adapt any existing software. This allows VPN sites to share information with each other over the Internet without exposing any information to others."
 PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
+PKG_ADDON_NAME="tinc"
 PKG_ADDON_TYPE="xbmc.service"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
-PKG_MAINTAINER="Anton Voyl (awiouy at gmail dot com)"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 PKG_CONFIGURE_OPTS_TARGET="--disable-curses   \
                            --disable-readline \
diff --git a/packages/addons/tools/mono/package.mk b/packages/addons/tools/mono/package.mk
index d147c0838f..27f295f498 100644
--- a/packages/addons/tools/mono/package.mk
+++ b/packages/addons/tools/mono/package.mk
@@ -27,17 +27,15 @@ PKG_SOURCE_DIR="$PKG_NAME-${PKG_VERSION%.*}"
 PKG_DEPENDS_TARGET="toolchain mono:host libgdiplus sqlite mono_sqlite zlib"
 PKG_PRIORITY="optional"
 PKG_SECTION="tools"
-PKG_SHORTDESC="Cross platform, open source .NET framework"
+PKG_SHORTDESC="Mono: a cross platform, open source .NET framework"
 PKG_LONGDESC="Mono ($PKG_VERSION) is a software platform designed to allow developers to easily create cross platform applications part of the .NET Foundation"
-PKG_MAINTAINER="Anton Voyl (awiouy)"
+PKG_AUTORECONF="yes"
 
 PKG_IS_ADDON="yes"
 PKG_ADDON_NAME="Mono (beta)"
 PKG_ADDON_TYPE="xbmc.python.script"
-PKG_ADDON_PROVIDES=""
 PKG_ADDON_REPOVERSION="8.0"
-
-PKG_AUTORECONF="yes"
+PKG_MAINTAINER="Anton Voyl (awiouy)"
 
 prefix="/storage/.kodi/addons/$PKG_SECTION.$PKG_NAME"
 configure_opts="--prefix=$prefix         \