3 files changed, 17 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7b5ff364fc..a0b364f9d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+Summary of changes from v169 to v170
+============================================
+
+Kay Sievers (1):
+      libudev: ctrl - properly wait for incoming message after connect
+
+Michal Soltys (1):
+      configure.ac: fixes for rule_generator and modeswitch
+
+
 Summary of changes from v168 to v169
 ============================================
 
diff --git a/NEWS b/NEWS
index a39f7d1cc1..0dc85ecb51 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+udev 170
+========
+Fix bug in control message handling, which can lead to a failing
+udevadm control --exit. Thanks to Jürg Billeter for help tracking
+it down.
+
 udev 169
 ========
 Bugfixes.
diff --git a/configure.ac b/configure.ac
index 3a2d927a2d..3646f9327d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([udev], [169], [linux-hotplug@vger.kernel.org])
+AC_INIT([udev], [170], [linux-hotplug@vger.kernel.org])
 AC_PREREQ(2.60)
 AM_INIT_AUTOMAKE([check-news foreign 1.10 dist-bzip2 subdir-objects])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])