diff -urNdp xbindkeys_config.orig/Makefile xbindkeys_config/Makefile
--- xbindkeys_config.orig/Makefile	Thu Feb  5 15:38:06 2004
+++ xbindkeys_config/Makefile	Sun Apr 10 23:07:22 2005
@@ -1,14 +1,13 @@
 # ex:ts=8
 # Ports collection makefile for:	xbindkeys_config
-# Date created:			Mar 4, 2002
-# Whom:				ijliao
+# Date created:			Mar 4, 2002 # Whom:				ijliao
 #
 # $FreeBSD: ports/x11/xbindkeys_config/Makefile,v 1.17 2004/02/05 20:38:06 trevor Exp $
 #
 
 PORTNAME=	xbindkeys_config
 PORTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	trevor
@@ -17,12 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An easy to use gtk program for configuring Xbindkeys
 
 PLIST_FILES=	bin/xbindkeys_config
-USE_GNOME=	gtk12
+USE_GNOME=	gtk20
 USE_REINPLACE=	yes
 MAKE_ENV=	CC="${CC} ${CFLAGS}"
 
 post-patch:
-	@${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g ; \
+	@${REINPLACE_CMD} -e "s,gtk-config,pkg-config gtk+-2.0,g ; \
 		s,^CC,#CC,g" ${WRKSRC}/Makefile
 
 do-install:
diff -urNdp xbindkeys_config.orig/files/patch-gtk2 xbindkeys_config/files/patch-gtk2
--- xbindkeys_config.orig/files/patch-gtk2	Wed Dec 31 19:00:00 1969
+++ xbindkeys_config/files/patch-gtk2	Sun Apr 10 23:05:12 2005
@@ -0,0 +1,36 @@
+diff -udp menu.c.orig menu.c
+--- menu.c.orig	Sun Apr 10 22:51:26 2005
++++ menu.c	Sun Apr 10 22:58:43 2005
+@@ -296,7 +296,7 @@ void menu_manual (GtkMenuItem *menuitem,
+   text = gtk_text_new(NULL,NULL);
+   
+   
+-  gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
++  gtk_text_insert (text, NULL, NULL, NULL,
+ 		   MANUAL_TEXT, sizeof(MANUAL_TEXT)-1);
+   gtk_box_pack_start(GTK_BOX(vbox), text, TRUE, TRUE, 0);
+   gtk_widget_set_usize(text,300,250);
+diff -udp middle.c.orig middle.c
+--- middle.c.orig	Sun Apr 10 22:59:11 2005
++++ middle.c	Sun Apr 10 23:00:21 2005
+@@ -565,7 +565,7 @@ void view_generated_file()
+     gtk_container_add (GTK_CONTAINER(src),  text);
+ 
+     while (fgets (line, sizeof(line), f))
+-      gtk_text_insert (GTK_TEXT(text), NULL, NULL, NULL,
++      gtk_text_insert (text, NULL, NULL, NULL,
+ 		       line, strlen(line));
+ 
+     gtk_container_add(GTK_CONTAINER(window),src);
+Binary files work.orig/xbindkeys_config-0.1.3/xbindkeys_config and work/xbindkeys_config-0.1.3/xbindkeys_config differ
+diff -udp xbindkeys_config.c.orig xbindkeys_config.c
+--- xbindkeys_config.c.orig	Sun Apr 10 22:49:47 2005
++++ xbindkeys_config.c	Sun Apr 10 22:50:56 2005
+@@ -95,7 +95,6 @@ int main (int argc, char *argv[])
+      accel_group = gtk_accel_group_new();
+      menu=xbindkeys_config_menu(accel_group);
+      gtk_box_pack_start(GTK_BOX(vbox),menu,FALSE,FALSE,0);
+-     gtk_accel_group_attach(accel_group, GTK_OBJECT(window));
+      
+      middle= xbindkeys_config_middle();
+      gtk_box_pack_start(GTK_BOX(vbox),middle,TRUE,TRUE,0);