diff --git a/ChangeLog b/ChangeLog
index ed37083fb..313512f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Rodrigo Moya <rodrigo@novell.com>
+
+	* configure.in:
+	* NEWS: updated for 2.17.1.
+
 2006-09-04  Rodrigo Moya <rodrigo@novell.com>
 
 	* NEWS: updated for 2.16.0.
diff --git a/NEWS b/NEWS
index eaa53444e..d6c0c73c0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,57 @@
+gnome-control-center 2.17.1
+
+control-center:
+- Don't install unused GNOME_Control_Center.server.in file (Rodrigo Moya)
+
+default applications:
+- Added support for legacy GConf key (Sven Herzberg, Luca Cavalli) (359986)
+
+mouse:
+- Reordered widgets for A11Y (Sven Herzberg) (163690)
+
+settings daemon:
+- Delay displaying of error dialogs until there is a window manager running
+  (Dan Winship)
+
+themus:
+- Add a install-theme command line option (Thomas Wood) (354581)
+
+translations:
+- bg (Alexander Shopov)
+- bn_IN (Runa Bhattacharjee)
+- cs (Jakub Friedl)
+- et (Priit Laes)
+- fi (Ilkka Tuohela)
+- it (Luca Ferretti)
+- nn (Åsmund Skjæveland)
+
+------------------------------------------------------------------------------
+gnome-control-center 2.16.1
+
+about-me:
+- Fixed compilation issues on Sun Studio (Matt Keenan) (349079)
+
+display:
+- Never pass negative values for the rates (Brian Cameron) (356075)
+
+keyboard:
+- Make sure 'model' is never NULL (Brian Cameron, Rodrigo Moya) (356074)
+
+themus:
+- Fixed "Open" icon on button preview (Thomas Wood) (355268)
+- Allow the text in the details to ellipsize and set a minimun width for
+  the dialog (Thomas Wood) (355269)
+
+translations:
+- ar (Wouter Bolsterlee)
+- bg (Alexander Shopov)
+- bn_IN (Runa Bhattacharjee)
+- en_GB (David Lodge)
+- et (Priit Laes)
+- gl (Ignacio Casal Quinteiro)
+- nn (Åsmund Skjæveland)
+
+------------------------------------------------------------------------------
 gnome-control-center 2.16.0
 
 background:
diff --git a/configure.in b/configure.in
index 3fd1f8fce..ad4c32ee2 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-AC_INIT([control-center], [2.17.0],
+AC_INIT([control-center], [2.17.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=control-center])
 
 AC_CONFIG_MACRO_DIR([m4])