diff --git a/ChangeLog b/ChangeLog
index bbacf76..ec885b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
-UNRELEASED
+2013-10-10  David Schweikert  <david@schweikert.ch>
+  * Version 3.6
   * Fix loop issue after 65536 pings (reported by Peter Folk and GBert, #12)
   * Minimum ping data size is now 0
   * Removed setsockopt IPV6_CHECKSUM, which shouldn't be set and breaks
diff --git a/configure.ac b/configure.ac
index fa87b3c..ea50c04 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Minimum Autoconf version required.
 AC_PREREQ(2.59)
 
-AC_INIT([fping],[3.6-rc2])
+AC_INIT([fping],[3.6])
 
 dnl make ipv4 and ipv6 options
 AC_ARG_ENABLE([ipv4],