diff --git a/CHANGELOG b/CHANGELOG
index 93aad4e5f..d43178b21 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,18 @@
 ChangeLog :
 ===========
 
+2006/05/21 : 1.2.14
+   - new HTML status report with the 'stats' keyword.
+   - added the 'abortonclose' option to better resist traffic surges
+   - implemented dynamic traffic regulation with the 'minconn' option
+   - show request time on denied requests
+   - definitely fixed hot reconf on OpenBSD by the use of SO_REUSEPORT
+   - now a proxy instance is allowed to run without servers, which is
+     useful to dedicate one instance to stats
+   - added lots of error counters
+   - a missing parenthesis preventd matching of cacheable cookies
+   - a missing parenthesis in poll_loop() might have caused missed events.
+
 2006/05/14 : 1.2.13.1
    - an uninitialized field in the struct session could cause a crash when
      the session was freed. This has been encountered on Solaris only.
diff --git a/Makefile b/Makefile
index 6607ce08c..feec783d2 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 # You should use it this way :
 #   make TARGET=os CPU=cpu
 
-VERSION := 1.2.13.1
+VERSION := 1.2.14
 
 # Select target OS. TARGET must match a system for which COPTS and LIBS are
 # correctly defined below.
@@ -116,7 +116,7 @@ haproxy: src/list.o src/chtbl.o src/hashpjw.o haproxy.o src/base64.o src/uri_aut
 	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean:
-	rm -f *.[oas] *~ *.rej core haproxy test nohup.out gmon.out src/*.[oas]
+	rm -f {.,src}/*.[oas] {.,src,include,doc}/*{~,.rej} core haproxy test nohup.out gmon.out
 	rm -f haproxy-$(VERSION).tar.gz haproxy-$(VERSION)
 
 tar:	clean
diff --git a/doc/haproxy-en.txt b/doc/haproxy-en.txt
index d27f04d61..e7b877fda 100644
--- a/doc/haproxy-en.txt
+++ b/doc/haproxy-en.txt
@@ -2,9 +2,9 @@
                              H A - P r o x y
                             Reference  Manual
                            -------------------
-                              version 1.2.13
+                              version 1.2.14
                               willy tarreau
-                                2006/05/13
+                                2006/05/21
 
 ============
 | Abstract |
diff --git a/doc/haproxy-fr.txt b/doc/haproxy-fr.txt
index 6a1ca79d2..215765725 100644
--- a/doc/haproxy-fr.txt
+++ b/doc/haproxy-fr.txt
@@ -2,9 +2,9 @@
                              H A - P r o x y
                            Manuel de référence
                            -------------------
-                              version 1.2.13
+                              version 1.2.14
                               willy tarreau
-                                2006/05/13
+                                2006/05/21
 
 ================
 | Introduction |
diff --git a/examples/haproxy-small.spec b/examples/haproxy-small.spec
index 18db2b4e5..14f278866 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.2.13
+Version: 1.2.14
 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
+* Wed May 21 2006 Willy Tarreau <willy@w.ods.org>
+- updated to 1.2.14
+
 * Wed May 01 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.13
 
diff --git a/examples/haproxy.spec b/examples/haproxy.spec
index 3617f7adb..5dcb2e321 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.2.13
+Version: 1.2.14
 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
+* Wed May 21 2006 Willy Tarreau <willy@w.ods.org>
+- updated to 1.2.14
+
 * Wed May 01 2006 Willy Tarreau <willy@w.ods.org>
 - updated to 1.2.13
 
diff --git a/haproxy.c b/haproxy.c
index 0abe937b7..7b5daf2d4 100644
--- a/haproxy.c
+++ b/haproxy.c
@@ -91,11 +91,11 @@
 #include "include/mini-clist.h"
 
 #ifndef HAPROXY_VERSION
-#define HAPROXY_VERSION "1.2.13.1"
+#define HAPROXY_VERSION "1.2.14"
 #endif
 
 #ifndef HAPROXY_DATE
-#define HAPROXY_DATE	"2006/05/14"
+#define HAPROXY_DATE	"2006/05/21"
 #endif
 
 /* this is for libc5 for example */