diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index af183fd..5da4dd5 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,3 +1,18 @@
+pytest-xdist 1.18.0 (2017-06-26)
+================================
+
+Features
+--------
+
+- Add long option `--numprocesses` as alternative for `-n`. (#168)
+
+
+Bug Fixes
+---------
+
+- Fix serialization and deserialization dropping longrepr details. (#133)
+
+
 pytest-xdist 1.17.1 (2017-06-10)
 ================================
 
diff --git a/changelog/133.bugfix b/changelog/133.bugfix
deleted file mode 100644
index 2e52656..0000000
--- a/changelog/133.bugfix
+++ /dev/null
@@ -1 +0,0 @@
-Fix serialization and deserialization dropping longrepr details. 
\ No newline at end of file
diff --git a/changelog/168.feature b/changelog/168.feature
deleted file mode 100644
index aaa2175..0000000
--- a/changelog/168.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add long option `--numprocesses` as alternative for `-n`.