diff --git a/wvdial/.md5sum b/wvdial/.md5sum
index 09e12d7a2..53e6f792d 100644
--- a/wvdial/.md5sum
+++ b/wvdial/.md5sum
@@ -1,3 +1,4 @@
 d084772c96db6c52371e36b29d95f332  wvdial-1.56.patch
 45097f269c7847266e121e4a0f362be9  wvdial-1.56.tar.gz
+f8efd865a0c4da3cdf80f53622357a87  wvstreams-4.2.2-gcc41.patch
 103230cb9926cb8f3f4d8dc8584f3b9c  wvstreams-4.2.2.tar.gz
diff --git a/wvdial/Pkgfile b/wvdial/Pkgfile
index 6c5344606..8ad9e4f97 100644
--- a/wvdial/Pkgfile
+++ b/wvdial/Pkgfile
@@ -5,13 +5,14 @@
 
 name=wvdial
 version=1.56
-release=1
+release=2
 source=(http://open.nit.ca/download/$name-$version.tar.gz \
         http://open.nit.ca/download/wvstreams-4.2.2.tar.gz \
-        $name-$version.patch)
+        wvstreams-4.2.2-gcc41.patch $name-$version.patch)
 
 build() {
     cd wvstreams-4.2.2
+    patch -p1 -i $SRC/wvstreams-4.2.2-gcc41.patch
     ./configure --prefix=/usr \
                 --enable-verbose \
                 --without-{bdb,qdbm,pam,tcl,telephony,swig,qt,openslp}
diff --git a/wvdial/wvstreams-4.2.2-gcc41.patch b/wvdial/wvstreams-4.2.2-gcc41.patch
new file mode 100644
index 000000000..48877715f
--- /dev/null
+++ b/wvdial/wvstreams-4.2.2-gcc41.patch
@@ -0,0 +1,64 @@
+diff -Nru wvstreams-4.2.2.orig/include/uniconfkey.h wvstreams-4.2.2/include/uniconfkey.h
+--- wvstreams-4.2.2.orig/include/uniconfkey.h	2006-11-26 18:33:38.134167426 +0100
++++ wvstreams-4.2.2/include/uniconfkey.h	2006-11-26 18:37:08.864296426 +0100
+@@ -113,7 +113,7 @@
+     bool iswild() const;
+ 
+     /** Returns true if the key has a trailing slash. */
+-    bool UniConfKey::hastrailingslash() const;
++    bool hastrailingslash() const;
+ 
+     /**
+      * Returns the number of segments in this path.
+diff -Nru wvstreams-4.2.2.orig/include/wvhttppool.h wvstreams-4.2.2/include/wvhttppool.h
+--- wvstreams-4.2.2.orig/include/wvhttppool.h	2006-11-26 18:33:38.214167426 +0100
++++ wvstreams-4.2.2/include/wvhttppool.h	2006-11-26 18:39:30.294486426 +0100
+@@ -57,7 +57,7 @@
+     WvString linkname;
+     WvUrl url;
+ 
+-    WvUrlLink::WvUrlLink(WvStringParm _linkname, WvStringParm _url)
++    WvUrlLink(WvStringParm _linkname, WvStringParm _url)
+ 	: linkname(_linkname), url(_url)
+     {}
+ };
+diff -Nru wvstreams-4.2.2.orig/include/wvstring.h wvstreams-4.2.2/include/wvstring.h
+--- wvstreams-4.2.2.orig/include/wvstring.h	2006-11-26 18:33:38.334167426 +0100
++++ wvstreams-4.2.2/include/wvstring.h	2006-11-26 18:37:08.864296426 +0100
+@@ -393,7 +393,7 @@
+     
+ protected:
+     void copy_constructor(const WvFastString &s);
+-    inline void WvString::construct(const char *_str)
++    inline void construct(const char *_str)
+         {
+             link(&nullbuf, _str);
+     
+diff -Nru wvstreams-4.2.2.orig/include/wvx509.h wvstreams-4.2.2/include/wvx509.h
+--- wvstreams-4.2.2.orig/include/wvx509.h	2006-11-26 18:33:38.384167426 +0100
++++ wvstreams-4.2.2/include/wvx509.h	2006-11-26 18:37:08.864296426 +0100
+@@ -349,19 +349,19 @@
+      * Set the Certificate to use X509v3, since that's all modern
+      * PKI uses anyways :)
+      */
+-    void WvX509Mgr::set_version();
++    void set_version();
+ 
+     /**
+      * Get and set the keyUsage field.
+      */
+-    WvString WvX509Mgr::get_key_usage();
+-    void WvX509Mgr::set_key_usage(WvStringParm values);
++    WvString get_key_usage();
++    void set_key_usage(WvStringParm values);
+ 
+     /**
+      * Get and set the extendedKeyUsage field.
+      */
+-    WvString WvX509Mgr::get_ext_key_usage();
+-    void WvX509Mgr::set_ext_key_usage(WvStringParm values);
++    WvString get_ext_key_usage();
++    void set_ext_key_usage(WvStringParm values);
+     
+     /**
+      * Return the Subject alt name if it exists, and WvString::null if