diff --git a/CHANGELOG b/CHANGELOG
index 4f49dbcd7..b48265c21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,12 @@
 ChangeLog :
 ===========
 
+2007/06/03 : 1.3.11.4
+    - do not re-arm read timeout in SHUTR state !
+    - optimize I/O by detecting system starvation
+    - the epoll FD must not be shared between processes
+    - limit the number of events returned by *poll*
+
 2007/05/14 : 1.3.11.3
     - pre-initialize timeouts with tv_eternity during parsing
 
diff --git a/Makefile b/Makefile
index 073a7d9fa..04fbd732f 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.11.3
+VERSION := 1.3.11.4
 SUBVERS := 
-VERDATE := 2007/05/14
+VERDATE := 2007/06/03
 endif
 
 #### build options
diff --git a/Makefile.bsd b/Makefile.bsd
index 4f0ea5ff9..3ace82672 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.11.3
+VERSION := 1.3.11.4
 
 # 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 482da496a..3e91456c6 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.11.3
+VERSION := 1.3.11.4
 
 # 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 d9255fcf2..00cfd282e 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.11.3
+Version: 1.3.11.4
 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 Jun  3 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.11.4
+
 * Mon May 14 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.11.3
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 1896b3230..25aee208f 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.11.3
+Version: 1.3.11.4
 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 Jun  3 2007 Willy Tarreau <w@1wt.eu>
+- updated to 1.3.11.4
+
 * Mon May 14 2007 Willy Tarreau <w@1wt.eu>
 - updated to 1.3.11.3
 
diff --git a/include/common/version.h b/include/common/version.h
index fcf4cb610..ad987fc3a 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.11.3"
+#define HAPROXY_VERSION "1.3.11.4"
 #endif
 
 #ifdef CONFIG_HAPROXY_DATE
 #define HAPROXY_DATE    CONFIG_HAPROXY_DATE
 #else
-#define HAPROXY_DATE    "2007/05/14"
+#define HAPROXY_DATE    "2007/06/03"
 #endif
 
 #endif /* _COMMON_VERSION_H */