diff --git a/srcpkgs/wvstreams/patches/gcc-6.patch b/srcpkgs/wvstreams/patches/gcc-6.patch
new file mode 100644
index 00000000000..c1c5812e955
--- /dev/null
+++ b/srcpkgs/wvstreams/patches/gcc-6.patch
@@ -0,0 +1,35 @@
+--- streams/wvstream.cc.orig	2016-11-30 11:01:20.506154631 +0400
++++ streams/wvstream.cc	2016-11-30 11:09:08.821961476 +0400
+@@ -907,9 +907,9 @@
+     
+     if (forceable)
+     {
+-	si.wants.readable = readcb;
+-	si.wants.writable = writecb;
+-	si.wants.isexception = exceptcb;
++	si.wants.readable = static_cast<bool>(readcb);
++	si.wants.writable = static_cast<bool>(writecb);
++	si.wants.isexception = static_cast<bool>(exceptcb);
+     }
+     else
+     {
+@@ -1019,7 +1019,8 @@
+ 
+ IWvStream::SelectRequest WvStream::get_select_request()
+ {
+-    return IWvStream::SelectRequest(readcb, writecb, exceptcb);
++    return IWvStream::SelectRequest(static_cast<bool>(readcb), static_cast<bool>(writecb),
++				    static_cast<bool>(exceptcb));
+ }
+ 
+ 
+@@ -1107,7 +1108,8 @@
+     // inefficient, because if the alarm was expired then pre_select()
+     // returned true anyway and short-circuited the previous select().
+     TRACE("hello-%p\n", this);
+-    return !alarm_was_ticking || select(0, readcb, writecb, exceptcb);
++    return !alarm_was_ticking || select(0, static_cast<bool>(readcb),
++					static_cast<bool>(writecb), static_cast<bool>(exceptcb));
+ }
+ 
+ 
diff --git a/srcpkgs/wvstreams/patches/no_optimize.patch b/srcpkgs/wvstreams/patches/no_optimize.patch
new file mode 100644
index 00000000000..f2fa90d4224
--- /dev/null
+++ b/srcpkgs/wvstreams/patches/no_optimize.patch
@@ -0,0 +1,13 @@
+--- argp/argp-fmtstream.h.orig	2016-11-30 11:59:03.981286513 +0400
++++ argp/argp-fmtstream.h	2016-11-30 12:00:49.524271289 +0400
+@@ -199,8 +199,8 @@
+ extern void __argp_fmtstream_update (argp_fmtstream_t __fs);
+ extern int _argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount);
+-
+-#ifdef __OPTIMIZE__
++
++#if 0
+ /* Inline versions of above routines.  */
+ 
+ #if !_LIBC
diff --git a/srcpkgs/wvstreams/template b/srcpkgs/wvstreams/template
index 91616c23314..2de75fe887f 100644
--- a/srcpkgs/wvstreams/template
+++ b/srcpkgs/wvstreams/template
@@ -1,13 +1,13 @@
 # Template file for 'wvstreams'
 pkgname=wvstreams
 version=4.6.1
-revision=12
+revision=13
 build_style=gnu-configure
 maintainer="Enno Boland <gottox@voidlinux.eu>"
 license="LGPL-2"
 short_desc="Library for doing network in C++"
 homepage="https://code.google.com/p/wvstreams"
-distfiles="https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/wvstreams/wvstreams-${version}.tar.gz"
+distfiles="${DEBIAN_SITE}/main/w/${pkgname}/${pkgname}_${version}.orig.tar.gz"
 makedepends="libressl-devel zlib-devel"
 checksum=8403f5fbf83aa9ac0c6ce15d97fd85607488152aa84e007b7d0621b8ebc07633
 configure_args="--sbindir=/usr/bin --without-dbus --without-tcl --without-qt"