diff --git a/nbd-3.11.tar.xz b/nbd-3.11.tar.xz
deleted file mode 100644
index 981e1b8..0000000
--- a/nbd-3.11.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:14420f74cb16dc609a9302ed1efd653064bed7a8357e9d73daabc33608e3f2a0
-size 451992
diff --git a/nbd-3.12.1.tar.xz b/nbd-3.12.1.tar.xz
new file mode 100644
index 0000000..74801ab
--- /dev/null
+++ b/nbd-3.12.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b105b9bedd82d86aee2e81e624bea33461db9918d58ddd79f5f2fd534c8b73de
+size 470676
diff --git a/nbd.changes b/nbd.changes
index 92729da..f55cb2a 100644
--- a/nbd.changes
+++ b/nbd.changes
@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Tue Dec  1 17:01:47 UTC 2015 - p.drouand@gmail.com
+- Update to version 3.12.1
+  * ensures the source to the "nbdtab" man page is correctly shipped 
+    with the rest of the source.
+- Changes from version 3.12
+  * inetd mode should work again, now using the default export name
+    in the newstyle protocol 
+  * when specifying an export on the server command line or not specifying
+    a name on a client command line, the newstyle protocol is used with 
+    the default export name (but a warning will be produced stating 
+    that oldstyle is no longer supported) 
+  * All traces of oldstyle (except a few error messages) have been 
+    removed 
+  * We now listen on IPv4 and IPv6 by default, regardless of what 
+    the system's configuration is like, by explicitly listening both 
+    on 0.0.0.0 and ::. 
+  * Some bugs in the handling of the TRIM command have been removed 
+  * nbd  *client now uses readit() in the negotiation, rather than 
+    plain non  *retrying read(). 
+  * It is now possible to listen on multiple addresses; the 
+    "listenaddr" parameter has been changed into a comma  *separated 
+    list of addresses to listen on 
+  * nbd  *client now supports an nbdtab file, which allows connecting
+    a device by just using the device name 
+  * nbd  *server now uses a GThreadPool to implement asynchronous handling 
+    of requests   
+  * Punching holes on files is now supported on cygwin, too.
+- Remove no-return-nonvoid.patch; fixed on upstream release
+
 -------------------------------------------------------------------
 Thu May 28 11:32:18 UTC 2015 - mpluskal@suse.com
 
diff --git a/nbd.spec b/nbd.spec
index 5be5430..ff0b1d6 100644
--- a/nbd.spec
+++ b/nbd.spec
@@ -17,7 +17,7 @@
 
 
 Name:           nbd
-Version:        3.11
+Version:        3.12.1
 Release:        0
 Summary:        Network Block Device Server and Client Utilities
 License:        GPL-2.0+
@@ -30,8 +30,6 @@ Source3:        config.example
 Source4:        nbd-server.sysconfig
 Patch2:         nbd-2.9.25-close.diff
 Patch3:         nbd-2.9.25-doxyfile.diff
-# fix return value
-Patch4:         no-return-nonvoid.patch
 BuildRequires:  doxygen
 BuildRequires:  glib2-devel >= 2.26.0
 BuildRequires:  xz
@@ -88,7 +86,6 @@ the connection closes.
 %setup -q
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 export CFLAGS="%{optflags} -fstack-protector -fno-strict-aliasing"
diff --git a/no-return-nonvoid.patch b/no-return-nonvoid.patch
deleted file mode 100644
index a0ec47a..0000000
--- a/no-return-nonvoid.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: nbd-3.11/nbd-server.c
-===================================================================
---- nbd-3.11.orig/nbd-server.c
-+++ nbd-3.11/nbd-server.c
-@@ -1525,6 +1525,7 @@ CLIENT* negotiate(int net, GArray* serve
- 		err_nonfatal("Session terminated by client");
- 		return NULL;
- 	}
-+ 	return NULL;
- }
- 
- void send_export_info(CLIENT* client) {