diff --git a/CHANGELOG b/CHANGELOG
index 634628682..cc6f620a7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,23 @@
 ChangeLog :
 ===========
 
+2007/03/25 : 1.3.8
+    - fixed several bugs which might have caused a crash with bad configs
+    - several optimizations in header processing
+    - many progresses towards transaction-based processing
+    - option forwardfor may be used in frontends
+    - completed HTTP response processing
+    - some code refactoring between request and response processing
+    - new HTTP header manipulation functions
+    - optimizations on the recv() patch to reduce CPU usage under very
+      high data rates.
+    - more user-friendly help about the 'usesrc' keyword (CTTPROXY)
+    - username/groupname support from Marcus Rueckert
+    - added the "except" keyword to the "forwardfor" option (Bryan German)
+    - support for health-checks on other addresses (Fabrice Dulaunoy)
+    - makefile for MacOS 10.4 / Darwin (Dan Zinngrabe)
+    - do not insert "Connection: close" in HTTP/1.0 messages
+
 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
diff --git a/Makefile b/Makefile
index a08f0100b..d3847c45d 100644
--- a/Makefile
+++ b/Makefile
@@ -109,9 +109,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.7
+VERSION := 1.3.8
 SUBVERS := 
-VERDATE := 2007/01/26
+VERDATE := 2007/03/25
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index cea9e06f4..88977c57f 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.7
+VERSION := 1.3.8
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.
diff --git a/Makefile.osx b/Makefile.osx
index 497c671dd..5e37f9878 100644
--- a/Makefile.osx
+++ b/Makefile.osx
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.3.7
+VERSION := 1.3.8
 
 # 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 53ab54bc5..cc5b59682 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.7
+Version: 1.3.8
 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
+* Sun Mar 25 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.8
+
 * Wed Jan 26 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.7
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 77ee425a6..c93d354b5 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.7
+Version: 1.3.8
 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
+* Sun Mar 25 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.8
+
 * Wed Jan 26 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.7
 
diff --git a/include/common/version.h b/include/common/version.h
index 86f6c1b2d..60737622a 100644
--- a/include/common/version.h
+++ b/include/common/version.h
@@ -2,7 +2,7 @@
   include/common/version.h
   This file serves as a template for future include files.
 
-  Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
+  Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
   
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
@@ -57,13 +57,13 @@
 #ifdef CONFIG_HAPROXY_VERSION
 #define HAPROXY_VERSION CONFIG_HAPROXY_VERSION
 #else
-#define HAPROXY_VERSION "1.3.7"
+#define HAPROXY_VERSION "1.3.8"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/01/26"
+#define HAPROXY_DATE    "2007/03/25"
 #endif
 
 #endif /* _COMMON_VERSION_H */