diff --git a/devel/gconf2/Makefile b/devel/gconf2/Makefile
index 846df9bc8bc6..589207ceb74b 100644
--- a/devel/gconf2/Makefile
+++ b/devel/gconf2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gconf2
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/GConf/2.6
diff --git a/devel/gconf2/distinfo b/devel/gconf2/distinfo
index a49004abc172..21598702bc60 100644
--- a/devel/gconf2/distinfo
+++ b/devel/gconf2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/GConf-2.6.0.tar.bz2) = 241ca25941e5bfa0f71725c30e17ab6e
-SIZE (gnome2/GConf-2.6.0.tar.bz2) = 1428714
+MD5 (gnome2/GConf-2.6.1.tar.bz2) = 194fab4e2e87c7ae3c7fea926fd281bc
+SIZE (gnome2/GConf-2.6.1.tar.bz2) = 1483080
diff --git a/devel/gconf2/files/patch-gconf_gconf-internals.c b/devel/gconf2/files/patch-gconf_gconf-internals.c
new file mode 100644
index 000000000000..4637dceb571c
--- /dev/null
+++ b/devel/gconf2/files/patch-gconf_gconf-internals.c
@@ -0,0 +1,10 @@
+--- gconf/gconf-internals.c.orig	Tue Apr 20 01:24:46 2004
++++ gconf/gconf-internals.c	Tue Apr 20 01:24:56 2004
+@@ -2839,7 +2839,6 @@
+                        GError  **error)
+ {
+   ConfigServer server = CORBA_OBJECT_NIL;
+-;
+   int p[2] = { -1, -1 };
+   char buf[1];
+   GError *tmp_err;
diff --git a/devel/gconf2/pkg-plist b/devel/gconf2/pkg-plist
index adf99d563086..1de1907d8daf 100644
--- a/devel/gconf2/pkg-plist
+++ b/devel/gconf2/pkg-plist
@@ -66,6 +66,7 @@ share/locale/cy/LC_MESSAGES/GConf2.mo
 share/locale/da/LC_MESSAGES/GConf2.mo
 share/locale/de/LC_MESSAGES/GConf2.mo
 share/locale/el/LC_MESSAGES/GConf2.mo
+share/locale/en_CA/LC_MESSAGES/GConf2.mo
 share/locale/en_GB/LC_MESSAGES/GConf2.mo
 share/locale/es/LC_MESSAGES/GConf2.mo
 share/locale/eu/LC_MESSAGES/GConf2.mo
@@ -74,6 +75,7 @@ share/locale/fi/LC_MESSAGES/GConf2.mo
 share/locale/fr/LC_MESSAGES/GConf2.mo
 share/locale/ga/LC_MESSAGES/GConf2.mo
 share/locale/gl/LC_MESSAGES/GConf2.mo
+share/locale/gu/LC_MESSAGES/GConf2.mo
 share/locale/hi/LC_MESSAGES/GConf2.mo
 share/locale/hr/LC_MESSAGES/GConf2.mo
 share/locale/hu/LC_MESSAGES/GConf2.mo
@@ -90,6 +92,7 @@ share/locale/ms/LC_MESSAGES/GConf2.mo
 share/locale/nl/LC_MESSAGES/GConf2.mo
 share/locale/nn/LC_MESSAGES/GConf2.mo
 share/locale/no/LC_MESSAGES/GConf2.mo
+share/locale/pa/LC_MESSAGES/GConf2.mo
 share/locale/pl/LC_MESSAGES/GConf2.mo
 share/locale/pt/LC_MESSAGES/GConf2.mo
 share/locale/pt_BR/LC_MESSAGES/GConf2.mo