diff --git a/x11/gnome/mime-data/Makefile b/x11/gnome/mime-data/Makefile
index 2fde4a9f89d..72c3181746a 100644
--- a/x11/gnome/mime-data/Makefile
+++ b/x11/gnome/mime-data/Makefile
@@ -1,10 +1,9 @@
-# $OpenBSD: Makefile,v 1.17 2007/07/05 22:50:11 jasper Exp $
+# $OpenBSD: Makefile,v 1.18 2007/07/11 19:46:58 jasper Exp $
 
 COMMENT=		MIME and Application database for GNOME
 
 GNOME_PROJECT=		gnome-mime-data
-GNOME_VERSION=		2.4.3
-PKGNAME=		${DISTNAME}p0
+GNOME_VERSION=		2.18.0
 CATEGORIES=		x11
 
 # GPL
diff --git a/x11/gnome/mime-data/distinfo b/x11/gnome/mime-data/distinfo
index 837aee22bdd..c40293636ef 100644
--- a/x11/gnome/mime-data/distinfo
+++ b/x11/gnome/mime-data/distinfo
@@ -1,5 +1,5 @@
-MD5 (gnome/gnome-mime-data-2.4.3.tar.bz2) = Kr5XOm6EtxxYpmHUuvqb1g==
-RMD160 (gnome/gnome-mime-data-2.4.3.tar.bz2) = X1JvMuyzz9AdK7gXrGa+tjyub1M=
-SHA1 (gnome/gnome-mime-data-2.4.3.tar.bz2) = wvkEXLbLQXu0vWatqzC4rjXf2zc=
-SHA256 (gnome/gnome-mime-data-2.4.3.tar.bz2) = ax6ppLUBnXdRVWPBlkBWn52B4XRzB6yetxcHcOl7tJw=
-SIZE (gnome/gnome-mime-data-2.4.3.tar.bz2) = 563654
+MD5 (gnome/gnome-mime-data-2.18.0.tar.bz2) = VBhYGI+ACQ0SoztafDTULA==
+RMD160 (gnome/gnome-mime-data-2.18.0.tar.bz2) = YkNtpnO5qeHScllRFAH/afA5eho=
+SHA1 (gnome/gnome-mime-data-2.18.0.tar.bz2) = nOexokqX8nX2C0FvroLYHBAQy2U=
+SHA256 (gnome/gnome-mime-data-2.18.0.tar.bz2) = NxlrWzcIW7zUXDOMNuJomP413Vl1KV9p9IAosehDb9c=
+SIZE (gnome/gnome-mime-data-2.18.0.tar.bz2) = 607012
diff --git a/x11/gnome/mime-data/patches/patch-Makefile_in b/x11/gnome/mime-data/patches/patch-Makefile_in
new file mode 100644
index 00000000000..42f8cc418d5
--- /dev/null
+++ b/x11/gnome/mime-data/patches/patch-Makefile_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-Makefile_in,v 1.1 2007/07/11 19:46:58 jasper Exp $
+--- Makefile.in.orig	Fri Jul  6 12:33:26 2007
++++ Makefile.in	Fri Jul  6 12:33:41 2007
+@@ -228,7 +228,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = man po
+-pkgconfigdir = $(datadir)/pkgconfig
++pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = gnome-mime-data-2.0.pc
+ NULL = 
+ keys_in_files = gnome-vfs.keys.in
diff --git a/x11/gnome/mime-data/patches/patch-configure b/x11/gnome/mime-data/patches/patch-configure
index 587eac45ca9..3c2c74e8b17 100644
--- a/x11/gnome/mime-data/patches/patch-configure
+++ b/x11/gnome/mime-data/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.1 2007/03/17 14:17:58 jasper Exp $
---- configure.orig	Wed Nov  1 06:34:28 2006
-+++ configure	Wed Dec 20 07:44:11 2006
-@@ -4243,7 +4243,7 @@ if test "${ac_cv_lib_intl_bindtextdomain
+$OpenBSD: patch-configure,v 1.2 2007/07/11 19:46:58 jasper Exp $
+--- configure.orig	Fri Jul  6 12:28:33 2007
++++ configure	Fri Jul  6 12:29:51 2007
+@@ -4995,7 +4995,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; 
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -10,7 +10,7 @@ $OpenBSD: patch-configure,v 1.1 2007/03/17 14:17:58 jasper Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4308,7 +4308,7 @@ if test "${ac_cv_lib_intl_ngettext+set}"
+@@ -5057,7 +5057,7 @@ if test "${ac_cv_lib_intl_ngettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -19,7 +19,7 @@ $OpenBSD: patch-configure,v 1.1 2007/03/17 14:17:58 jasper Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4373,7 +4373,7 @@ if test "${ac_cv_lib_intl_dgettext+set}"
+@@ -5119,7 +5119,7 @@ if test "${ac_cv_lib_intl_dgettext+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -28,16 +28,16 @@ $OpenBSD: patch-configure,v 1.1 2007/03/17 14:17:58 jasper Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4594,7 +4594,7 @@ fi
+@@ -5331,7 +5331,7 @@ fi
          #
          if test "$gt_cv_func_dgettext_libintl" = "yes" ; then
            glib_save_LIBS="$LIBS"
 -          LIBS="$LIBS -lintl $libintl_extra_libs"
-+          LIBS="$LIBS -lintl -iconv $libintl_extra_libs"
++          LIBS="$LIBS -lintl -liconv $libintl_extra_libs"
            unset ac_cv_func_bind_textdomain_codeset
  
  for ac_func in bind_textdomain_codeset
-@@ -4717,7 +4717,7 @@ done
+@@ -5446,7 +5446,7 @@ done
        fi
  
        if test "$gt_cv_func_dgettext_libintl" = "yes"; then