diff --git a/packages/addons/driver/hdhomerun/changelog.txt b/packages/addons/driver/hdhomerun/changelog.txt
index 750a04886d..32d81ca428 100644
--- a/packages/addons/driver/hdhomerun/changelog.txt
+++ b/packages/addons/driver/hdhomerun/changelog.txt
@@ -1,8 +1,2 @@
-8.0.100
-- Update for LibreELEC 8.0
-
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
\ No newline at end of file
+100
+- Initial add-on
diff --git a/packages/addons/driver/imon-mce/changelog.txt b/packages/addons/driver/imon-mce/changelog.txt
index 750a04886d..636d1e9738 100644
--- a/packages/addons/driver/imon-mce/changelog.txt
+++ b/packages/addons/driver/imon-mce/changelog.txt
@@ -1,8 +1,5 @@
-8.0.100
-- Update for LibreELEC 8.0
+101
+- Added proper icon and description
 
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
\ No newline at end of file
+100
+- Initial add-on
diff --git a/packages/addons/driver/sapphire/changelog.txt b/packages/addons/driver/sapphire/changelog.txt
index 394f45512d..3bb58d92b5 100644
--- a/packages/addons/driver/sapphire/changelog.txt
+++ b/packages/addons/driver/sapphire/changelog.txt
@@ -1,8 +1,8 @@
-8.0.102
+102
 - Rebuild driver against 4.8 kernel
 
-8.0.101
+101
 - Rebuild driver against 4.7 kernel
 
-8.0.100
+100
 - Initial add-on
diff --git a/packages/addons/driver/steamcontroller/changelog.txt b/packages/addons/driver/steamcontroller/changelog.txt
index f97605c6e3..bac318fd4b 100644
--- a/packages/addons/driver/steamcontroller/changelog.txt
+++ b/packages/addons/driver/steamcontroller/changelog.txt
@@ -1,6 +1,6 @@
-8.1.101
+101
 - Update to 60499dc
 - Fix cpu usage due to high polling rate
 
-8.0.100
+100
 - Initial add-on
diff --git a/packages/addons/driver/sundtek-mediatv/changelog.txt b/packages/addons/driver/sundtek-mediatv/changelog.txt
index 3eb6749321..d1e9232460 100755
--- a/packages/addons/driver/sundtek-mediatv/changelog.txt
+++ b/packages/addons/driver/sundtek-mediatv/changelog.txt
@@ -1,17 +1,11 @@
-8.0.102
-- automatically update driver to latest version on first install
-  show driver version in addon settings
-  allow update for aarch64 architecture
-  german translations
+102
+- Automatically update driver to latest version on first install
+- Show driver version in addon settings
+- Allow update for aarch64 architecture
+- German translations
 
-8.0.101
-- system wait-for-online preference is now respected
+101
+- System wait-for-online preference is now respected
 
-8.0.100
-- Update for LibreELEC 8.0
-
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
\ No newline at end of file
+100
+- Initial add-on
diff --git a/packages/addons/service/boblightd/changelog.txt b/packages/addons/service/boblightd/changelog.txt
index 750a04886d..32d81ca428 100644
--- a/packages/addons/service/boblightd/changelog.txt
+++ b/packages/addons/service/boblightd/changelog.txt
@@ -1,8 +1,2 @@
-8.0.100
-- Update for LibreELEC 8.0
-
-7.0.101
-- added proper icon and description
-
-7.0.100
-- initial LibreELEC version
\ No newline at end of file
+100
+- Initial add-on
diff --git a/packages/addons/service/emby/changelog.txt b/packages/addons/service/emby/changelog.txt
index b8448939f9..35b1720262 100644
--- a/packages/addons/service/emby/changelog.txt
+++ b/packages/addons/service/emby/changelog.txt
@@ -1,56 +1,56 @@
-114:
+114
 - Update to version 3.2.17.0
 - Rebuild libx264, ffmpegx and imagemagick
 - Use ffmpgex by default
 
-113:
+113
 - Update to version 3.2.8
 - Rebuild x264 and ffmpegx
 
-112:
+112
 - Refer to libMagickWand-7
 
-111:
+111
 - Updated to version 3.2.5
 - Rebuild libx264, ffmpegx and imagemagick
 
-110:
+110
 - Rebuild ffmpegx with libx264
 
-109:
+109
 - Rebuild ffmpgex and imagemagick
 
-108:
+108
 - Update to version 3.0.8500
 
-107:
+107
 - Update to version 3.0.8300
 - Rebuild ffmpegx
 
-106:
+106
 - Updat to version 3.0.8100
 - Rebuild ffmpegx
 
-105:
+105
 - Update to version 3.0.7100
 
-104:
+104
 - Update to version 3.0.6300
 - Rebuild ffmpegx
 
-103:
+103
 - Update to version 3.0.6070
 - Build for all architectures
 - Refer to libsqlite3.so.0 instead of libsqlite3.so
 
-102:
+102
 - Update to version 3.0.6030
 - Add dedicated ffmpeg and ffprobe
 - Remove unused shared libraries
 
-101:
+101
 - Update to version 3.0.5985
 - Removed mono build dependency
 
-100:
-- Initial release
+100
+- Initial add-on
diff --git a/packages/addons/service/emby/package.mk b/packages/addons/service/emby/package.mk
index 7b6aaa31f7..558311a63a 100644
--- a/packages/addons/service/emby/package.mk
+++ b/packages/addons/service/emby/package.mk
@@ -28,7 +28,7 @@ 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_IS_ADDON="yes"
-PKG_ADDON_NAME="Emby (beta)"
+PKG_ADDON_NAME="Emby"
 PKG_ADDON_TYPE="xbmc.service"
 PKG_ADDON_REQUIRES="tools.mono:0.0.0"
 PKG_MAINTAINER="Anton Voyl (awiouy)"
diff --git a/packages/addons/service/lcdd/changelog.txt b/packages/addons/service/lcdd/changelog.txt
index 19dfc699bc..dc392443b2 100644
--- a/packages/addons/service/lcdd/changelog.txt
+++ b/packages/addons/service/lcdd/changelog.txt
@@ -1,16 +1,16 @@
-104:
+104
 - Update to 466edd3
 
-103:
+103
 - Update to 0.5.8
 
-102:
+102
 - Update to c05a7de
 - Reintroduce dm140 driver
 - Build with libugpio
 
-101:
+101
 - Update to upstream 1554506
 
-100:
+100
 - Initial addon
diff --git a/packages/addons/service/locale/changelog.txt b/packages/addons/service/locale/changelog.txt
index 6c3e832395..1dc057c936 100644
--- a/packages/addons/service/locale/changelog.txt
+++ b/packages/addons/service/locale/changelog.txt
@@ -1,5 +1,5 @@
-101:
+101
 - Fix dialog message
 
-100:
+100
 - Initial add-on
diff --git a/packages/addons/service/rsyslog/changelog.txt b/packages/addons/service/rsyslog/changelog.txt
index 4f7534df67..83fb51963f 100755
--- a/packages/addons/service/rsyslog/changelog.txt
+++ b/packages/addons/service/rsyslog/changelog.txt
@@ -1,10 +1,10 @@
-8.0.100
-- Initial addon
+102
+- Add first run wizard configuration menu
 
-8.0.101
+101
 - Add RELP Protocol
 - Add ability to compress messages using TCP/UDP protocols
 - Update configuration files using newer standards
 
-8.0.102
-- Add first run wizard configuration menu
+100
+- Initial addon
diff --git a/packages/addons/service/tinc/changelog.txt b/packages/addons/service/tinc/changelog.txt
index 954056c4fe..e2d944a8bb 100755
--- a/packages/addons/service/tinc/changelog.txt
+++ b/packages/addons/service/tinc/changelog.txt
@@ -1,5 +1,5 @@
-8.0.101
+101
 - Bump to tinc-1.1pre14
 
-8.0.100
+100
 - Initial addon
diff --git a/packages/addons/service/usbmuxd/changelog.txt b/packages/addons/service/usbmuxd/changelog.txt
index 747949c2d5..32d81ca428 100644
--- a/packages/addons/service/usbmuxd/changelog.txt
+++ b/packages/addons/service/usbmuxd/changelog.txt
@@ -1,2 +1,2 @@
-8.1.100
-- initial release
+100
+- Initial add-on
diff --git a/packages/addons/tools/mono/changelog.txt b/packages/addons/tools/mono/changelog.txt
index 09d69c9434..ddd2772466 100644
--- a/packages/addons/tools/mono/changelog.txt
+++ b/packages/addons/tools/mono/changelog.txt
@@ -1,19 +1,19 @@
-105:
+105
 - Update to 5.0.1.1
 
-104:
+104
 - Update to 5.0.0.100
 
-103:
+103
 - Update to 4.8.1.0
 
-102:
+102
 - Update to 4.8.0.495
 
-101:
+101
 - Update to 4.2.1.102
 - Build static for all projects and architectures
 - Remove uneeded binaries and libraries
 
-100:
-- Initial release
+100
+- Initial add-on
diff --git a/packages/addons/tools/network-tools/changelog.txt b/packages/addons/tools/network-tools/changelog.txt
index f6abfd1747..32d81ca428 100644
--- a/packages/addons/tools/network-tools/changelog.txt
+++ b/packages/addons/tools/network-tools/changelog.txt
@@ -1,2 +1,2 @@
-8.0.100
-- Initial Release
+100
+- Initial add-on