diff --git a/x11-toolkits/p5-Gtk/Makefile b/x11-toolkits/p5-Gtk/Makefile
index 67dfacecbdc9..2b84ba87100b 100644
--- a/x11-toolkits/p5-Gtk/Makefile
+++ b/x11-toolkits/p5-Gtk/Makefile
@@ -10,8 +10,8 @@ PORTVERSION= 	0.7004
 CATEGORIES=	x11-toolkits lang perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	Gtk
-DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 PKGNAMEPREFIX=	p5-
+DISTNAME=	${PORTNAME}-Perl-${PORTVERSION}
 
 MAINTAINER=	vanilla@FreeBSD.org
 
@@ -23,6 +23,6 @@ MANPREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 
 do-configure:
 	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${PERL5} Makefile.PL \
-	--with-gdkimlib --without-gnome CC="${CC}" CCFLAGS="${CFLAGS}"
+	CC="${CC}" CCFLAGS="${CFLAGS}"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/p5-Gtk/files/patch-Makefile.PL b/x11-toolkits/p5-Gtk/files/patch-Makefile.PL
new file mode 100644
index 000000000000..f70ad884eb9e
--- /dev/null
+++ b/x11-toolkits/p5-Gtk/files/patch-Makefile.PL
@@ -0,0 +1,33 @@
+--- Makefile.PL.orig	Wed Aug  9 22:30:38 2000
++++ Makefile.PL	Tue Sep 12 11:54:31 2000
+@@ -102,10 +102,10 @@
+ 	$threadl = "";
+ }
+ 
+-$libs = `gtk-config --libs $threadl`;
++$libs = `$ENV{GTK_CONFIG} --libs $threadl`;
+ $libs = "-L/usr/X11R6/lib -lgtk -lgdk -lglib -lX11 -lXext" if not defined $libs;
+ 
+-$inc = `gtk-config --cflags $threadl`;
++$inc = `$ENV{GTK_CONFIG} --cflags $threadl`;
+ 
+ $libs =~ s/\s+/ /g;
+ $inc =~ s/\s+/ /g;
+@@ -167,7 +167,7 @@
+ 
+ # build the keysyms mapping
+ {
+-	my ($incfile) = `gtk-config --prefix`;
++	my ($incfile) = `$ENV{GTK_CONFIG} --prefix`;
+ 	chomp($incfile);
+ 	$incfile .= "/include/gdk/gdkkeysyms.h";
+ 
+@@ -470,7 +470,7 @@
+ sub gtk_version {
+ 	my($result);
+ 
+-	$result = `gtk-config --version`;
++	$result = `$ENV{GTK_CONFIG} --version`;
+ 	chomp $result;
+ 	
+ 	if (not defined $result) {
diff --git a/x11-toolkits/p5-Gtk/pkg-comment b/x11-toolkits/p5-Gtk/pkg-comment
index 6d04cfbb9959..4264c529ec63 100644
--- a/x11-toolkits/p5-Gtk/pkg-comment
+++ b/x11-toolkits/p5-Gtk/pkg-comment
@@ -1 +1 @@
-A perl5 interface to Gtk Graphics Library
+The base module of Gtk-Perl
diff --git a/x11-toolkits/p5-Gtk/pkg-descr b/x11-toolkits/p5-Gtk/pkg-descr
index a8117257066f..def05e3fb9d7 100644
--- a/x11-toolkits/p5-Gtk/pkg-descr
+++ b/x11-toolkits/p5-Gtk/pkg-descr
@@ -1,7 +1,7 @@
-Gtk.pm is a perl module to access Gtk library,
-and this version(0.1.10) was designed around gtk 971025,
+Gtk-Perl is a set of modules that let you exploit the Gtk+ and Gnome
+libraries from Perl. The module maps the Gtk+ objects to Perl packages
+while trying to remain as close as possible to the C API, but not closer.
 
-Gtk is available at <ftp://ftp.gimp.org/pub/gtk/>.
+This is the base module (Gtk and Gtk::Gdk namespaces).
 
-- Vanilla
-vanilla@MinJe.com.TW
+WWW: http://projects.prosa.it/gtkperl/
diff --git a/x11-toolkits/p5-Gtk/pkg-plist b/x11-toolkits/p5-Gtk/pkg-plist
index 2c4e211e05b0..20d0a757077f 100644
--- a/x11-toolkits/p5-Gtk/pkg-plist
+++ b/x11-toolkits/p5-Gtk/pkg-plist
@@ -5,35 +5,33 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Gdk.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Keysyms.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/LogHandler.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Types.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/pkg.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/Files.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.1.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkTypes.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendefs.pl
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.defs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-0.99.typemap
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.0.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.1.defs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.3.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.4.defs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/MiscTypes.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.6.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.1.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.defs
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gtk-1.2.typemap
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/ppport.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/genext.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GdkTypes.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkInt.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/gendoc.pl
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/GtkDefs.h
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install/PerlGtkExt.h
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gtk.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/autosplit.ix
+lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk/autosplit.ix
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk/Install
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Gtk
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Gtk/Gdk