diff --git a/CHANGELOG b/CHANGELOG
index 3329e52..56847fd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,20 @@
 ChangeLog :
 ===========
 
+2007/04/15 : 1.3.9
+    - modularized the polling mechanisms and use function pointers instead
+      of macros at many places
+    - implemented support for FreeBSD's kqueue() polling mechanism
+    - fixed a warning on OpenBSD : MIN/MAX redefined
+    - change socket registration order at startup to accomodate kqueue.
+    - several makefile cleanups to support old shells
+    - fix build with limits.h once for all
+    - ev_epoll: do not rely on fd_sets anymore, use changes stacks instead.
+    - fdtab now holds the results of polling
+    - implemented support for speculative I/O processing with epoll()
+    - remove useless calls to shutdown(SHUT_RD), resulting in small speed boost
+    - auto-registering of pollers at load time
+
 2007/04/03 : 1.3.8.2
     - rewriting either the status line or request line could crash the
       process due to a pointer which ought to be reset before parsing.
diff --git a/Makefile b/Makefile
index 39240a6..c52b9bb 100644
--- a/Makefile
+++ b/Makefile
@@ -120,9 +120,9 @@
 else
 # Otherwise, use the hard-coded version of last tag, number of changes
 # since last tag, and release date.
-VERSION := 1.3.8.2
+VERSION := 1.3.9
 SUBVERS := 
-VERDATE := 2007/04/03
+VERDATE := 2007/04/15
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index 0050701..27efe89 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.8.2
+VERSION := 1.3.9
 
 # 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 5c87d7b..111587b 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.8.2
+VERSION := 1.3.9
 
 # 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 f0c872c..42c6264 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.8.2
+Version: 1.3.9
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -69,6 +69,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Sun Apr 15 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.9
+
 * Tue Apr 03 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.8.2
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index c94085a..f1e0592 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.8.2
+Version: 1.3.9
 Release: 1
 License: GPL
 Group: System Environment/Daemons
@@ -71,6 +71,9 @@
 %attr(0755,root,root) %config %{_sysconfdir}/rc.d/init.d/%{name}
 
 %changelog
+* Sun Apr 15 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.9
+
 * Tue Apr 03 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.8.2
 
diff --git a/include/common/version.h b/include/common/version.h
index 21e198b..dfc14dc 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.8.2"
+#define HAPROXY_VERSION "1.3.9"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/04/03"
+#define HAPROXY_DATE    "2007/04/15"
 #endif
 
 #endif /* _COMMON_VERSION_H */