diff --git a/README.md b/README.md
index ef0fb246..25f021d2 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 [![stable version](https://img.shields.io/badge/stable_version-1.8.18-blue.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/stable/repository.plexkodiconnect/repository.plexkodiconnect-1.0.2.zip) 
-[![beta version](https://img.shields.io/badge/beta_version-2.0.17-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
+[![beta version](https://img.shields.io/badge/beta_version-2.0.18-red.svg?maxAge=60&style=flat) ](https://github.com/croneter/binary_repo/raw/master/beta/repository.plexkodiconnectbeta/repository.plexkodiconnectbeta-1.0.2.zip)
 
 [![Installation](https://img.shields.io/badge/wiki-installation-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/Installation)
 [![FAQ](https://img.shields.io/badge/wiki-FAQ-brightgreen.svg?maxAge=60&style=flat)](https://github.com/croneter/PlexKodiConnect/wiki/faq)
diff --git a/addon.xml b/addon.xml
index 7377c817..c9928aa2 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.0.17" provider-name="croneter">
+<addon  id="plugin.video.plexkodiconnect" name="PlexKodiConnect" version="2.0.18" provider-name="croneter">
   <requires>
     <import addon="xbmc.python" version="2.1.0"/>
     <import addon="script.module.requests" version="2.9.1" />
@@ -67,7 +67,16 @@
     <summary lang="ru_RU">Нативная интеграция сервера Plex в Kodi</summary>
     <description lang="ru_RU">Подключите Kodi к своему серверу Plex. Плагин предполагает что вы управляете своими видео с помощью Plex (а не в Kodi). Вы можете потерять текущие базы данных музыки и видео в Kodi (так как плагин напрямую их изменяет). Используйте на свой страх и риск</description>
     <disclaimer lang="ru_RU">Используйте на свой страх и риск</disclaimer>
-    <news>version 2.0.17 (beta only):
+    <news>version 2.0.18 (beta only):
+- Fix some playqueue inconsistencies using Plex Companion
+- Direct paths: fix replaying item where playback was started via PMS
+- Fix Plex trailers screwing up playqueue 
+- Fix IndexError when emptying Kodi playqueue
+- Incorporate PKC player in kodimonitor module
+- Fix pretty printing of PKC playqueues not working
+- Code cleanups
+
+version 2.0.17 (beta only):
 - Finally make PKC compatible with Kodi 18 Leia Alpha 1
 - Fix information screen and Plex option not working
 - Activate Kodi background updates to hide "Compressing Database"
diff --git a/changelog.txt b/changelog.txt
index 50576566..82bfb380 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,12 @@
+version 2.0.18 (beta only):
+- Fix some playqueue inconsistencies using Plex Companion
+- Direct paths: fix replaying item where playback was started via PMS
+- Fix Plex trailers screwing up playqueue 
+- Fix IndexError when emptying Kodi playqueue
+- Incorporate PKC player in kodimonitor module
+- Fix pretty printing of PKC playqueues not working
+- Code cleanups
+
 version 2.0.17 (beta only):
 - Finally make PKC compatible with Kodi 18 Leia Alpha 1
 - Fix information screen and Plex option not working