diff --git a/editors/vim5/Makefile b/editors/vim5/Makefile
index 35daa942b62a..890ce8f4ac7c 100644
--- a/editors/vim5/Makefile
+++ b/editors/vim5/Makefile
@@ -54,7 +54,7 @@ MAKE_FLAGS:=	X_LIBS=-lxpg4 CONF_OPT_MAX="--enable-max-features" ${MAKE_FLAGS}
 .if defined(HAVE_GTK)
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-CONFIGURE=	GTK_CONFIG="${GTK_CONFIG}"
+CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}"
 MAKE_FLAGS:=	CONF_OPT_GUI="--enable-gui=gtk --with-gtk-prefix=${X11BASE} --enable-multibyte --enable-fontset --enable-multibyte --enable-xim" ${MAKE_FLAGS}
 .elif defined(HAVE_MOTIF)
 REQUIRES_MOTIF=	yes
diff --git a/editors/vim5/files/patch-02 b/editors/vim5/files/patch-02
index f74cb6530149..0b0b26335fdc 100644
--- a/editors/vim5/files/patch-02
+++ b/editors/vim5/files/patch-02
@@ -1,5 +1,19 @@
 --- configure.orig	Sun Sep 19 03:59:45 1999
 +++ configure	Sun Oct 24 21:47:29 1999
+@@ -2906,11 +2906,11 @@
+ 
+   if test "x$gtk_config_prefix" != "x" ; then
+      gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
+-     GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
++     GTK_CONFIG=$gtk_config_prefix/bin/gtk12-config
+   fi
+   if test "x$gtk_config_exec_prefix" != "x" ; then
+      gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
+-     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
++     GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk12-config
+   fi
+   if test "X$GTK_CONFIG" = "X"; then
+     # Extract the first word of "gtk-config", so it can be a program name with args.
 @@ -3098,7 +3098,7 @@
    gui_libs="`echo $x_libraries|sed 's%/^/^/*$%%'` `echo "$gui_XXX" | sed s/XXX/lib/g` `echo "$GUI_INC_LOC" | sed s/include/lib/` $GUI_LIB_LOC"
    GUI_LIB_LOC=