diff --git a/CHANGELOG b/CHANGELOG
index 7abbd61..cd47890 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -31,7 +31,7 @@ Add a new mkdir2 command that also takes a mode argument.
 
 Add a new readlink2 command that avoids having to preallocate the buffer.
 
-Add support for RPC timeouts for the async interface.
+Add support for RPC timeouts for both the sync and async interfaces.
 
 Build fixes for Mingw and Cygwin
 
diff --git a/configure.ac b/configure.ac
index f55ecf0..df7e949 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.50)
-AC_INIT([libnfs], [1.11.0], [ronniesahlberg@gmail.com])
+AC_INIT([libnfs], [2.0.0], [ronniesahlberg@gmail.com])
 AC_CONFIG_HEADERS([config.h])
 AM_INIT_AUTOMAKE([-Wall foreign subdir-objects])
 AC_CANONICAL_HOST
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 21b96bc..9fbd395 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -23,9 +23,9 @@ libnfs_la_SOURCES = \
 	socket.c \
 	../win32/win32_compat.c
 
-SOCURRENT=10
+SOCURRENT=11
 SOREVISION=0
-SOAGE=2
+SOAGE=0
 libnfs_la_LDFLAGS = -version-info $(SOCURRENT):$(SOREVISION):$(SOAGE)
 libnfs_la_LIBADD = \
 	../mount/libmount.la \
diff --git a/packaging/RPM/libnfs.spec.in b/packaging/RPM/libnfs.spec.in
index 03da7b6..c78c492 100644
--- a/packaging/RPM/libnfs.spec.in
+++ b/packaging/RPM/libnfs.spec.in
@@ -112,6 +112,29 @@ Utility programs for LibNFS
 %{_mandir}/man1/nfs-ls.1.gz
 
 %changelog
+* Fri Jun 16 2017 : Version 2.0.0
+ - Add RPC/RAW layer support for NFSv4
+ - Add support for building RPC servers using libnfs
+ - Add support for setting RPC timeouts for all interfaces.
+ - Add O_NOFOLLOW to nfs_open()
+ - Add a new mkdir2 command that also takes a mode argument.
+ - Add a new readlink2 command that avoids having to preallocate the
+   output buffer.
+ - Build fixes for Mingw and Cygwin.
+ - Use SOCK_CLOEXEC for the sockets
+ - Make rpc_set{g|u}id() public
+ - Performance optimization: socket: Batch pdu read in rpc_read_from_socket
+ - Fix NULL pointer crash in nfs_link().
+ - Clamp read/write size for servers (Ganesha) that offer very large io sizes
+   instead of failing to connect to the export.
+ - Tell the server to commit all data to stable storage when we close files.
+ - Double free fix: don't call rpc_free_pdu() after rpc_queue_pdu() failure.
+ - Fix for memory leak in rpc_allocate_*().
+ - Fixes to build nfs-ls and nfs-cp on win32.
+ - Abort the mount process correctly if MOUNT/MNT returns error or is cancelled.
+ - Fix memory leak in error path in nfs_create_2_cb().
+ - Fix leak of rpc->inbuf if we destroy the context while we still have PDUs
+   in flight.
 * Sun Oct 9 2016 : Version 1.11.0
  - Reduce the number of memory allocations in the ZDR layer.
  - Check both seconds and nanoseconds field when validating dir cache.