diff --git a/ChangeLog b/ChangeLog
index 78055fd1..dc7949ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+Mon Jan 10 14:07:33 CET 2011
+	Releasing libmicrohttpd 0.9.5. -CG
+
 Wed Jan  5 15:20:11 CET 2011
 	Fixing double-locking on non-Linux platforms when using
 	MHD_create_response_from_fd (#1639). -CG
diff --git a/configure.ac b/configure.ac
index 204d32ac..86557b0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,15 +21,15 @@
 #
 #
 AC_PREREQ(2.57)
-AC_INIT([libmicrohttpd], [0.9.4],[libmicrohttpd@gnu.org])
-AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.4])
+AC_INIT([libmicrohttpd], [0.9.5],[libmicrohttpd@gnu.org])
+AM_INIT_AUTOMAKE([libmicrohttpd], [0.9.5])
 AM_CONFIG_HEADER([MHD_config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AH_TOP([#define _GNU_SOURCE  1])
 
-LIB_VERSION_CURRENT=12
+LIB_VERSION_CURRENT=13
 LIB_VERSION_REVISION=0
-LIB_VERSION_AGE=2
+LIB_VERSION_AGE=3
 AC_SUBST(LIB_VERSION_CURRENT)
 AC_SUBST(LIB_VERSION_REVISION)
 AC_SUBST(LIB_VERSION_AGE)
diff --git a/doc/Doxyfile b/doc/Doxyfile
index 1563b84c..ab2b6109 100644
--- a/doc/Doxyfile
+++ b/doc/Doxyfile
@@ -5,7 +5,7 @@
 #---------------------------------------------------------------------------
 DOXYFILE_ENCODING      = UTF-8
 PROJECT_NAME           = "GNU libmicrohttpd"
-PROJECT_NUMBER         = 0.4.2
+PROJECT_NUMBER         = 0.9.5
 OUTPUT_DIRECTORY       = doc/doxygen/
 CREATE_SUBDIRS         = YES
 OUTPUT_LANGUAGE        = English
diff --git a/doc/libmicrohttpd.3 b/doc/libmicrohttpd.3
index 848c9aba..f69a1e6d 100644
--- a/doc/libmicrohttpd.3
+++ b/doc/libmicrohttpd.3
@@ -1,11 +1,8 @@
-.TH LIBMICROHTTPD "3" "10 Sep 2010 "libmicrohttpd"
+.TH LIBMICROHTTPD "3" "10 Jan 2011 "libmicrohttpd"
 .SH "NAME"
 GNU libmicrohttpd \- library for embedding HTTP servers
 .SH "SYNOPSIS"
 
- \fB#include <sys/types.h>
- \fB#include <sys/select.h>
- \fB#include <sys/socket.h>
  \fB#include <microhttpd.h>
 
 .SH "DESCRIPTION"
diff --git a/src/include/microhttpd.h b/src/include/microhttpd.h
index c63e43bb..b2ab1c33 100644
--- a/src/include/microhttpd.h
+++ b/src/include/microhttpd.h
@@ -106,7 +106,7 @@ extern "C"
 /**
  * Current version of the library.
  */
-#define MHD_VERSION 0x00090400
+#define MHD_VERSION 0x00090500
 
 /**
  * MHD-internal return code for "YES".