diff --git a/libraries/mysql++/mysql++.SlackBuild b/libraries/mysql++/mysql++.SlackBuild
index e6aad09eef..e14dbed4f7 100644
--- a/libraries/mysql++/mysql++.SlackBuild
+++ b/libraries/mysql++/mysql++.SlackBuild
@@ -24,7 +24,7 @@
 
 
 PRGNAM=mysql++
-VERSION=3.0.9	
+VERSION=3.1.0
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}		
 
@@ -63,7 +63,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.?z*
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -72,6 +72,9 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Thanks archlinux for these
+for i in $CWD/patches/* ; do patch -p1 < $i ; done
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/libraries/mysql++/mysql++.info b/libraries/mysql++/mysql++.info
index 1541404454..3906780109 100644
--- a/libraries/mysql++/mysql++.info
+++ b/libraries/mysql++/mysql++.info
@@ -1,8 +1,8 @@
 PRGNAM="mysql++"
-VERSION="3.0.9"
+VERSION="3.1.0"
 HOMEPAGE="http://tangentsoft.net/mysql++/"
-DOWNLOAD="http://tangentsoft.net/mysql++/releases/mysql++-3.0.9.tar.gz"
-MD5SUM="4acc1603846fe67d36b6243bfb805652"
+DOWNLOAD="http://tangentsoft.net/mysql++/releases/mysql++-3.1.0.tar.gz"
+MD5SUM="d92769cc579b87a60e58a77099cc4f0e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/mysql++/patches/mysql++-fix-cstring.patch b/libraries/mysql++/patches/mysql++-fix-cstring.patch
new file mode 100644
index 0000000000..2a9faeb071
--- /dev/null
+++ b/libraries/mysql++/patches/mysql++-fix-cstring.patch
@@ -0,0 +1,11 @@
+diff -Naur mysql++-3.1.0.old/ssx/genv2.cpp mysql++-3.1.0/ssx/genv2.cpp
+--- mysql++-3.1.0.old/ssx/genv2.cpp	2010-06-12 11:12:11.574891331 +0200
++++ mysql++-3.1.0/ssx/genv2.cpp	2010-06-12 11:14:00.564881723 +0200
+@@ -35,6 +35,7 @@
+ #include <iostream>
+ #include <fstream>
+ #include <typeinfo>
++#include <cstring>
+ 
+ using namespace std;
+ 
diff --git a/libraries/mysql++/patches/mysql++-fix-size_t.patch b/libraries/mysql++/patches/mysql++-fix-size_t.patch
new file mode 100644
index 0000000000..908141d5d4
--- /dev/null
+++ b/libraries/mysql++/patches/mysql++-fix-size_t.patch
@@ -0,0 +1,21 @@
+diff -Naur mysql++-3.1.0.old//lib/refcounted.h mysql++-3.1.0/lib/refcounted.h
+--- mysql++-3.1.0.old//lib/refcounted.h	2010-06-03 19:59:23.000000000 +0200
++++ mysql++-3.1.0/lib/refcounted.h	2011-04-23 12:35:39.943366970 +0200
+@@ -101,7 +101,7 @@
+ 	{
+ 		std::auto_ptr<T> exception_guard(counted_);
+ 		if (counted_) {
+-			refs_ = new size_t(1);
++			refs_ = new std::size_t(1);
+ 		}
+ 		exception_guard.release();	// previous new didn't throw
+ 	}
+@@ -255,7 +255,7 @@
+ 	/// We can't keep this as a plain integer because this object
+ 	/// allows itself to be copied.  All copies need to share this
+ 	/// reference count, not just the pointer to the counted object.
+-	size_t* refs_;
++	std::size_t* refs_;
+ };
+ 
+