diff --git a/CMakeLists.txt b/CMakeLists.txt
index a50a6211..28aaab40 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.2)
 
-project(snapcast LANGUAGES CXX VERSION 0.17.1)
+project(snapcast LANGUAGES CXX VERSION 0.18.0)
 set(PROJECT_DESCRIPTION "Multi-room client-server audio player")
 set(PROJECT_URL "https://github.com/badaix/snapcast")
 
diff --git a/changelog.md b/changelog.md
index 0376c20d..317d35f4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,27 @@
 # Snapcast changelog
 
+## Version 0.18.0
+
+### Features
+
+- Add TCP stream reader
+
+### Bugfixes
+
+- Client: fix hostname reporting on Android
+- Fix some small memory leaks
+- Fix Librespot stream causing zombie processes (Issue #530)
+- Process stream watchdog is configurable (Issue #517)
+- Fix Makefile for macOS (Issues #510, #514)
+
+### General
+
+- Refactored stream readers
+- Server can run on a single thread
+- Configurable number of server worker threads
+
+_Johannes Pohl <snapcast@badaix.de>  Wed, 22 Jan 2020 00:13:37 +0200_
+
 ## Version 0.17.1
 
 ### Bugfixes
diff --git a/client/Makefile b/client/Makefile
index c21a17ca..c206df4c 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -14,7 +14,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION = 0.17.1
+VERSION = 0.18.0
 BIN = snapclient
 
 ifeq ($(TARGET), FREEBSD)
diff --git a/debian/changelog b/debian/changelog
index 1b78624d..37640077 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+snapcast (0.18.0-1) unstable; urgency=medium
+
+  * Features
+    -Add TCP stream reader
+  * Bugfixes
+    -Client: fix hostname reporting on Android
+    -Fix some small memory leaks
+    -Fix Librespot stream causing zombie processes (Issue #530)
+    -Process stream watchdog is configurable (Issue #517)
+    -Fix Makefile for macOS (Issues #510, #514)
+  * General
+    -Refactored stream readers
+    -Server can run on a single thread
+    -Configurable number of server worker threads
+
+ -- Johannes Pohl <snapcast@badaix.de>  Wed, 22 Jan 2020 00:13:37 +0200
+
 snapcast (0.17.1-1) unstable; urgency=medium
 
   * Bugfixes
diff --git a/server/Makefile b/server/Makefile
index eb99c6cd..cd6e4ee9 100644
--- a/server/Makefile
+++ b/server/Makefile
@@ -14,7 +14,7 @@
 #   You should have received a copy of the GNU General Public License
 #   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-VERSION = 0.17.1
+VERSION = 0.18.0
 BIN = snapserver
 
 ifeq ($(TARGET), FREEBSD)