diff --git a/CHANGELOG b/CHANGELOG
index 46cf985a9..bc3cee0c1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,14 @@
 ChangeLog :
 ===========
 
+2007/01/22 : 1.3.6
+    - stats now support the HEAD method too
+    - extracted http request from the session
+    - huge rework of the HTTP parser which is now a 28-state FSM.
+    - linux-style likely/unlikely macros for optimization hints
+    - do not create a server socket when there's no server
+    - imported lots of docs
+
 2007/01/07 : 1.3.5
     - stats: swap color sets for active and backup servers
     - try to guess server check port when unset
diff --git a/Makefile b/Makefile
index f8285d0d4..abd466402 100644
--- a/Makefile
+++ b/Makefile
@@ -110,9 +110,9 @@ VERDATE := $(shell date +%Y/%m/%d -d "$$(git-log HEAD^.. 2>/dev/null | grep -m 1
 else
 # Otherwise, use the hard-coded version of last tag, number of changes
 # since last tag, and release date.
-VERSION := 1.3.5
+VERSION := 1.3.6
 SUBVERS := 
-VERDATE := 2007/01/07
+VERDATE := 2007/01/22
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index 0c7124b8b..4ed8446d0 100644
--- a/Makefile.bsd
+++ b/Makefile.bsd
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.3.5
+VERSION := 1.3.6
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.
diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index f41a389ae..7f3103a84 100644
--- a/examples/haproxy-small.spec
+++ b/examples/haproxy-small.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.3.4
+Version: 1.3.6
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -69,6 +69,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Jan 22 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.6
+
 * Wed Jan 07 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.5
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 802aedbf8..12e7922a8 100644
--- a/examples/haproxy.spec
+++ b/examples/haproxy.spec
@@ -1,6 +1,6 @@
 Summary: HA-Proxy is a TCP/HTTP reverse proxy for high availability environments
 Name: haproxy
-Version: 1.3.5
+Version: 1.3.6
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@ fi
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Jan 22 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.6
+
 * Wed Jan 07 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.5
 
diff --git a/include/common/version.h b/include/common/version.h
index f2b4ff147..1efd70e21 100644
--- a/include/common/version.h
+++ b/include/common/version.h
@@ -57,13 +57,13 @@
 #ifdef CONFIG_HAPROXY_VERSION
 #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION
 #else
-#define HAPROXY_VERSION "1.3.5"
+#define HAPROXY_VERSION "1.3.6"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/01/07"
+#define HAPROXY_DATE    "2007/01/22"
 #endif
 
 #endif /* _COMMON_VERSION_H */
diff --git a/src/haproxy.c b/src/haproxy.c
index 84ee20911..3fe500bab 100644
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -1,6 +1,6 @@
 /*
  * HA-Proxy : High Availability-enabled HTTP/TCP proxy
- * Copyright 2000-2006  Willy Tarreau <w@1wt.eu>.
+ * Copyright 2000-2007  Willy Tarreau <w@1wt.eu>.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -145,7 +145,7 @@ static char hostname[MAX_HOSTNAME_LEN] = "";
 void display_version()
 {
 	printf("HA-Proxy version " HAPROXY_VERSION " " HAPROXY_DATE"\n");
-	printf("Copyright 2000-2006 Willy Tarreau <w@1wt.eu>\n\n");
+	printf("Copyright 2000-2007 Willy Tarreau <w@1wt.eu>\n\n");
 }
 
 /*