diff --git a/CHANGELOG b/CHANGELOG
index 2011de249..c51d8da33 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 ChangeLog :
 ===========
 
+2007/05/14 : 1.3.11
+    - fixed ev_sepoll again by rewriting the state machine
+    - switched all timeouts to timevals instead of milliseconds
+    - improved memory management using mempools v2.
+    - several minor optimizations
+
 2007/05/09 : 1.3.10.2
     - fixed build on OpenBSD (missing types.h)
 
diff --git a/Makefile b/Makefile
index 37439c30e..37a8684f6 100644
--- a/Makefile
+++ b/Makefile
@@ -120,9 +120,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.10.2
+VERSION := 1.3.11
 SUBVERS := 
-VERDATE := 2007/05/10
+VERDATE := 2007/05/14
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index cc8004086..2d7524361 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.10.2
+VERSION := 1.3.11
 
 # 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 5cf4f08fd..7dfc861e1 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.10.2
+VERSION := 1.3.11
 
 # 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 add45765d..ae29e9c55 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.10.2
+Version: 1.3.11
 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
+* Mon May 14 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.11
+
 * Thu May 10 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.10.2
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index b3ff47141..8f8fe827c 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.10.2
+Version: 1.3.11
 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
+* Mon May 14 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.11
+
 * Thu May 10 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.10.2
 
diff --git a/include/common/version.h b/include/common/version.h
index b5bbe0390..6b4280b58 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.10.2"
+#define HAPROXY_VERSION "1.3.11"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/05/10"
+#define HAPROXY_DATE    "2007/05/14"
 #endif
 
 #endif /* _COMMON_VERSION_H */