diff --git a/accessibility/gail/Makefile b/accessibility/gail/Makefile
index 7cd49c3cca4f..753026650e26 100644
--- a/accessibility/gail/Makefile
+++ b/accessibility/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.11
+PORTVERSION=	0.13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/accessibility/gail/distinfo b/accessibility/gail/distinfo
index 8e198f59c807..5f5022674b2d 100644
--- a/accessibility/gail/distinfo
+++ b/accessibility/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.11.tar.bz2) = b266bfd9fec90ceed7452b31b6078828
+MD5 (gnome2/gail-0.13.tar.bz2) = 1ac6af8a34eeb244633caadf80d76e67
diff --git a/accessibility/gail/files/patch-configure b/accessibility/gail/files/patch-configure
new file mode 100644
index 000000000000..933dfdd1a548
--- /dev/null
+++ b/accessibility/gail/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 11:07:42	1.1
++++ configure	2002/04/26 11:07:58
+@@ -6481,6 +6481,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/accessibility/gail/files/patch-ltmain.sh b/accessibility/gail/files/patch-ltmain.sh
deleted file mode 100644
index b0a3829f68e8..000000000000
--- a/accessibility/gail/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/accessibility/gail/files/Attic/patch-ltmain.sh,v 1.1 2002-02-17 10:27:29 sobomax Exp $
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/accessibility/gail/pkg-plist b/accessibility/gail/pkg-plist
index 66a568fdddd5..2b126a5937c0 100644
--- a/accessibility/gail/pkg-plist
+++ b/accessibility/gail/pkg-plist
@@ -1,11 +1,12 @@
-include/gail-1.0/util/gail-util.h
-include/gail-1.0/util/gailmisc.h
-include/gail-1.0/util/gailtextutil.h
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
 lib/gtk-2.0/modules/libferret.so
 lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
 lib/libgailutil.so
-lib/libgailutil.so.11
+lib/libgailutil.so.13
 libdata/pkgconfig/gail.pc
 @dirrm lib/gtk-2.0/modules
-@dirrm include/gail-1.0/util
+@dirrm include/gail-1.0/libgail-util
 @dirrm include/gail-1.0
diff --git a/x11-toolkits/gail/Makefile b/x11-toolkits/gail/Makefile
index 7cd49c3cca4f..753026650e26 100644
--- a/x11-toolkits/gail/Makefile
+++ b/x11-toolkits/gail/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gail
-PORTVERSION=	0.11
+PORTVERSION=	0.13
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta3
+MASTER_SITE_SUBDIR=	pre-gnome2/releases/gnome-2.0-desktop-beta4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,7 +19,7 @@ LIB_DEPENDS=	gnomecanvas-2.0:${PORTSDIR}/graphics/libgnomecanvas
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
-GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
diff --git a/x11-toolkits/gail/distinfo b/x11-toolkits/gail/distinfo
index 8e198f59c807..5f5022674b2d 100644
--- a/x11-toolkits/gail/distinfo
+++ b/x11-toolkits/gail/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gail-0.11.tar.bz2) = b266bfd9fec90ceed7452b31b6078828
+MD5 (gnome2/gail-0.13.tar.bz2) = 1ac6af8a34eeb244633caadf80d76e67
diff --git a/x11-toolkits/gail/files/patch-configure b/x11-toolkits/gail/files/patch-configure
new file mode 100644
index 000000000000..933dfdd1a548
--- /dev/null
+++ b/x11-toolkits/gail/files/patch-configure
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- configure	2002/04/26 11:07:42	1.1
++++ configure	2002/04/26 11:07:58
+@@ -6481,6 +6481,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/x11-toolkits/gail/files/patch-ltmain.sh b/x11-toolkits/gail/files/patch-ltmain.sh
deleted file mode 100644
index 907469b240fb..000000000000
--- a/x11-toolkits/gail/files/patch-ltmain.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-
-$FreeBSD: /tmp/pcvs/ports/x11-toolkits/gail/files/Attic/patch-ltmain.sh,v 1.1 2002-02-17 10:27:29 sobomax Exp $
-
---- ltmain.sh.orig	Wed Jan 23 11:38:40 2002
-+++ ltmain.sh	Sun Feb  3 01:44:17 2002
-@@ -1037,8 +1037,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+	compile_command="$compile_command -pthread"
-+	finalize_command="$finalize_command -pthread"
-+	compiler_flags="$compiler_flags -pthread"
-+	continue
-+	;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -2412,6 +2420,9 @@
- 	  *-*-netbsd*)
- 	    # Don't link with libc until the a.out ld.so is fixed.
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    # Add libc to deplibs on all other systems if necessary.
- 	    if test "$build_libtool_need_lc" = "yes"; then
-@@ -4179,10 +4190,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/x11-toolkits/gail/pkg-plist b/x11-toolkits/gail/pkg-plist
index 66a568fdddd5..2b126a5937c0 100644
--- a/x11-toolkits/gail/pkg-plist
+++ b/x11-toolkits/gail/pkg-plist
@@ -1,11 +1,12 @@
-include/gail-1.0/util/gail-util.h
-include/gail-1.0/util/gailmisc.h
-include/gail-1.0/util/gailtextutil.h
+include/gail-1.0/libgail-util/gail-util.h
+include/gail-1.0/libgail-util/gailmisc.h
+include/gail-1.0/libgail-util/gailtextutil.h
 lib/gtk-2.0/modules/libferret.so
 lib/gtk-2.0/modules/libgail.so
+lib/libgailutil.a
 lib/libgailutil.so
-lib/libgailutil.so.11
+lib/libgailutil.so.13
 libdata/pkgconfig/gail.pc
 @dirrm lib/gtk-2.0/modules
-@dirrm include/gail-1.0/util
+@dirrm include/gail-1.0/libgail-util
 @dirrm include/gail-1.0