diff --git a/CHANGELOG b/CHANGELOG
index 2719dee..6346286 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 ChangeLog :
 ===========
 
+2007/01/26 : 1.3.7
+    - fix critical bug introduced with 1.3.6 : an empty request header
+      may lead to a crash due to missing pointer assignment
+    - hdr_idx might be left uninitialized in debug mode
+    - fixed build on FreeBSD due to missing fd_set declaration
+
 2007/01/22 : 1.3.6.1
     - change in the header chaining broke cookies and authentication
 
diff --git a/Makefile b/Makefile
index c7934bb..d9b12f9 100644
--- a/Makefile
+++ b/Makefile
@@ -110,9 +110,9 @@
 else
 # Otherwise, use the hard-coded version of last tag, number of changes
 # since last tag, and release date.
-VERSION := 1.3.6.1
+VERSION := 1.3.7
 SUBVERS := 
-VERDATE := 2007/01/22
+VERDATE := 2007/01/26
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index 4ed8446..cea9e06 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.6
+VERSION := 1.3.7
 
 # 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 7f3103a..53ab54b 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.6
+Version: 1.3.7
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -69,6 +69,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Jan 26 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.7
+
 * Wed Jan 22 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.6
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 12e7922..77ee425 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.6
+Version: 1.3.7
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Wed Jan 26 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.7
+
 * Wed Jan 22 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.6
 
diff --git a/include/common/version.h b/include/common/version.h
index 1efd70e..86f6c1b 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.6"
+#define HAPROXY_VERSION "1.3.7"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/01/22"
+#define HAPROXY_DATE    "2007/01/26"
 #endif
 
 #endif /* _COMMON_VERSION_H */