diff --git a/devel/mysql-gui-common/Makefile b/devel/mysql-gui-common/Makefile
index dddae28765c..d0671a87c77 100644
--- a/devel/mysql-gui-common/Makefile
+++ b/devel/mysql-gui-common/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.12 2008/07/01 08:27:18 wilfried Exp $
+# $OpenBSD: Makefile,v 1.13 2009/09/18 10:24:50 ajacoutot Exp $
 
 COMMENT=	common libraries and data for the MySQL GUI Suites
 
 DISTNAME=	mysql-gui-tools-5.0r12
-PKGNAME=	mysql-gui-common-5.0.6.1r12p2
+PKGNAME=	mysql-gui-common-5.0.6.1r12p3
 CATEGORIES=	devel
 
 HOMEPAGE=	http://www.mysql.com/products/tools/administrator/
diff --git a/devel/mysql-gui-common/patches/patch-source_linux_MGConnectDialog_cc b/devel/mysql-gui-common/patches/patch-source_linux_MGConnectDialog_cc
index bba6089d658..0aeb7c3eba9 100644
--- a/devel/mysql-gui-common/patches/patch-source_linux_MGConnectDialog_cc
+++ b/devel/mysql-gui-common/patches/patch-source_linux_MGConnectDialog_cc
@@ -1,7 +1,27 @@
-$OpenBSD: patch-source_linux_MGConnectDialog_cc,v 1.1 2008/04/08 13:37:19 jasper Exp $
---- source/linux/MGConnectDialog.cc.orig	Tue Apr  8 14:58:03 2008
-+++ source/linux/MGConnectDialog.cc	Tue Apr  8 14:58:12 2008
-@@ -683,7 +683,7 @@ void MGConnectDialog::show_connection_failed()
+$OpenBSD: patch-source_linux_MGConnectDialog_cc,v 1.2 2009/09/18 10:24:50 ajacoutot Exp $
+--- source/linux/MGConnectDialog.cc.orig	Tue Dec  5 23:44:08 2006
++++ source/linux/MGConnectDialog.cc	Mon Sep 14 23:20:43 2009
+@@ -659,9 +659,9 @@ void MGConnectDialog::open_connection_editor()
+   // select back the original item
+   ((Gtk::OptionMenu*)_xml->get_widget("connection_list"))->set_history(_current_selected_item);
+ 
+-  SigC::Connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
++  sigc::connection c1= MGPreferencesEditor::instance()->signal_closed().connect(sigc::mem_fun(*this,
+                                                                                            &MGConnectDialog::preferences_closed));
+-  SigC::Connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
++  sigc::connection c2= MGPreferencesEditor::instance()->signal_changed().connect(sigc::mem_fun(*this,
+                                                                                             &MGConnectDialog::preferences_changed));
+   MGPreferencesEditor::instance()->show(true);
+   MGPreferencesEditor::instance()->set_modal(true);
+@@ -676,14 +676,14 @@ void MGConnectDialog::show_connection_failed()
+ {
+   Gtk::Button *btn;
+   pid_t ping_pid= 0;
+-  SigC::Connection input_handler;
++  sigc::connection input_handler;
+   int rc;
+   bool pinging= false;
+   int myerror= 0;
    Glib::ustring title= _app_title + " " + _("Error");
    char *ping_args[]= 
    {
diff --git a/devel/mysql-gui-common/patches/patch-source_linux_MGTreeTooltip_h b/devel/mysql-gui-common/patches/patch-source_linux_MGTreeTooltip_h
new file mode 100644
index 00000000000..cf8bc556c34
--- /dev/null
+++ b/devel/mysql-gui-common/patches/patch-source_linux_MGTreeTooltip_h
@@ -0,0 +1,12 @@
+$OpenBSD: patch-source_linux_MGTreeTooltip_h,v 1.1 2009/09/18 10:24:50 ajacoutot Exp $
+--- source/linux/MGTreeTooltip.h.orig	Mon Sep 14 23:17:05 2009
++++ source/linux/MGTreeTooltip.h	Mon Sep 14 23:17:23 2009
+@@ -39,7 +39,7 @@ class MGTreeTooltip : public Glib::Object {
+     
+     WillShowSignal _show_signal;
+     
+-    SigC::Connection _timeout;
++    sigc::connection _timeout;
+ 
+     void expose_event(GdkEventExpose *event);
+     void leave_event(GdkEventCrossing *event);