diff --git a/x11/gnome/yelp/Makefile b/x11/gnome/yelp/Makefile
index 12c1c97c570..d1d84adeaa0 100644
--- a/x11/gnome/yelp/Makefile
+++ b/x11/gnome/yelp/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.1.1.1 2003/01/31 19:09:10 todd Exp $
+# $OpenBSD: Makefile,v 1.2 2003/06/12 20:22:04 marcm Exp $
 
 COMMENT=		"GNOME 2.0 help browser"
 
-VERSION=		1.0.7
+VERSION=		2.2.0
 DISTNAME=		yelp-${VERSION}
 CATEGORIES=		x11/gnome
 
@@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/1.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/yelp/2.2/}
 EXTRACT_SUFX=		.tar.bz2
 
 MODULES=		gettext
diff --git a/x11/gnome/yelp/distinfo b/x11/gnome/yelp/distinfo
index 6dbc71c1686..55bb46f887c 100644
--- a/x11/gnome/yelp/distinfo
+++ b/x11/gnome/yelp/distinfo
@@ -1,3 +1,3 @@
-MD5 (yelp-1.0.7.tar.bz2) = cc487e4368588155271ce9272f906da0
-RMD160 (yelp-1.0.7.tar.bz2) = 9163f821f5a1bdad009e95ba11e90a4e5dbb1e12
-SHA1 (yelp-1.0.7.tar.bz2) = 8d4a982bb8f026edc6ebbbb59930bfed0aa0d51d
+MD5 (yelp-2.2.0.tar.bz2) = 1148afe2578ad50be59a591677946a4c
+RMD160 (yelp-2.2.0.tar.bz2) = f851b47866ae4c6a10c1fafc0669e2deb9b24466
+SHA1 (yelp-2.2.0.tar.bz2) = 7f950076a6f40bd1a145746be23f160d90adb86a
diff --git a/x11/gnome/yelp/patches/patch-configure b/x11/gnome/yelp/patches/patch-configure
deleted file mode 100644
index 8031297e3b3..00000000000
--- a/x11/gnome/yelp/patches/patch-configure
+++ /dev/null
@@ -1,44 +0,0 @@
-$OpenBSD: patch-configure,v 1.1.1.1 2003/01/31 19:09:10 todd Exp $
---- configure.orig	Mon Nov 18 14:25:41 2002
-+++ configure	Thu Nov 28 22:53:03 2002
-@@ -6080,8 +6080,8 @@ else
-     hardcode_direct=yes
-     hardcode_shlibpath_var=no
-     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
--      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
--      hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+      hardcode_libdir_flag_spec='${wl}-R$libdir'
-       export_dynamic_flag_spec='${wl}-E'
-     else
-       case "$host_os" in
-@@ -6090,8 +6090,8 @@ else
- 	hardcode_libdir_flag_spec='-R$libdir'
-         ;;
-       *)
--        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
--        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-+        hardcode_libdir_flag_spec='${wl}-R$libdir'
-         ;;
-       esac
-     fi
-@@ -6607,6 +6607,8 @@ openbsd*)
-   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-+  sys_lib_search_path_spec="/usr/lib"
-+  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
-   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-     case "$host_os" in
-     openbsd2.[89] | openbsd2.[89].*)
-@@ -11151,7 +11153,8 @@ echo "${ECHO_T}yes" >&6
- 
-             echo "$as_me:$LINENO: checking YELP_CFLAGS" >&5
- echo $ECHO_N "checking YELP_CFLAGS... $ECHO_C" >&6
--            YELP_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 1.1		\
-+            YELP_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.0.0		\
-+			gnome-vfs-2.0 >= 1.1		\
- 			libgnome-2.0 >= 2.0.2		\
- 			libgnomeui-2.0 >= 1.103.0	\
- 			libbonobo-2.0 >= 1.108.0	\
diff --git a/x11/gnome/yelp/patches/patch-ltmain_sh b/x11/gnome/yelp/patches/patch-ltmain_sh
index 0fe30942b2b..e5370f59045 100644
--- a/x11/gnome/yelp/patches/patch-ltmain_sh
+++ b/x11/gnome/yelp/patches/patch-ltmain_sh
@@ -1,7 +1,7 @@
-$OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 19:09:10 todd Exp $
---- ltmain.sh.orig	Mon Nov 18 14:25:36 2002
-+++ ltmain.sh	Thu Nov 28 22:53:03 2002
-@@ -1073,6 +1073,17 @@ compiler."
+$OpenBSD: patch-ltmain_sh,v 1.2 2003/06/12 20:22:04 marcm Exp $
+--- ltmain.sh.orig	Sat Jan 11 19:16:30 2003
++++ ltmain.sh	Sat May 31 06:22:02 2003
+@@ -1082,6 +1082,17 @@ compiler."
  	continue
  	;;
  
@@ -19,7 +19,7 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 19:09:10 todd Exp $
        -module)
  	module=yes
  	continue
-@@ -1530,6 +1541,9 @@ compiler."
+@@ -1522,6 +1533,9 @@ compiler."
  	  fi
  	  continue
  	  ;;
@@ -29,9 +29,9 @@ $OpenBSD: patch-ltmain_sh,v 1.1.1.1 2003/01/31 19:09:10 todd Exp $
  	%DEPLIBS%)
  	  alldeplibs=yes
  	  continue
-@@ -4526,40 +4540,6 @@ relink_command=\"$relink_command\""
+@@ -4575,40 +4589,6 @@ relink_command=\"$relink_command\""
      # Exit here if they wanted silent mode.
-     test "$show" = : && exit 0
+     test "$show" = ":" && exit 0
  
 -    echo "----------------------------------------------------------------------"
 -    echo "Libraries have been installed in:"
diff --git a/x11/gnome/yelp/patches/patch-po_Makefile_in_in b/x11/gnome/yelp/patches/patch-po_Makefile_in_in
new file mode 100644
index 00000000000..88e7571cd1c
--- /dev/null
+++ b/x11/gnome/yelp/patches/patch-po_Makefile_in_in
@@ -0,0 +1,12 @@
+$OpenBSD: patch-po_Makefile_in_in,v 1.1 2003/06/12 20:22:04 marcm Exp $
+--- po/Makefile.in.in.orig	Sat May 31 06:47:46 2003
++++ po/Makefile.in.in	Sat May 31 06:47:58 2003
+@@ -28,7 +28,7 @@ prefix = @prefix@
+ exec_prefix = @exec_prefix@
+ datadir = @datadir@
+ libdir = @libdir@
+-localedir = $(libdir)/locale
++localedir = $(datadir)/locale
+ gnulocaledir = $(datadir)/locale
+ gettextsrcdir = $(datadir)/glib-2.0/gettext/po
+ subdir = po
diff --git a/x11/gnome/yelp/pkg/PLIST b/x11/gnome/yelp/pkg/PLIST
index cb8c1287ba2..bf6e1723c21 100644
--- a/x11/gnome/yelp/pkg/PLIST
+++ b/x11/gnome/yelp/pkg/PLIST
@@ -1,6 +1,8 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2003/01/31 19:09:10 todd Exp $
+@comment $OpenBSD: PLIST,v 1.2 2003/06/12 20:22:04 marcm Exp $
+bin/gman
 bin/gnome-help
 bin/yelp
+bin/yelp-pregenerate
 lib/bonobo/servers/GNOME_Yelp.server
 libexec/yelp-db2html
 share/applications/yelp.desktop
@@ -19,14 +21,17 @@ share/locale/de/LC_MESSAGES/yelp.mo
 share/locale/el/LC_MESSAGES/yelp.mo
 share/locale/es/LC_MESSAGES/yelp.mo
 share/locale/et/LC_MESSAGES/yelp.mo
+share/locale/fi/LC_MESSAGES/yelp.mo
 share/locale/fr/LC_MESSAGES/yelp.mo
 share/locale/gl/LC_MESSAGES/yelp.mo
 share/locale/he/LC_MESSAGES/yelp.mo
+share/locale/hi/LC_MESSAGES/yelp.mo
 share/locale/hu/LC_MESSAGES/yelp.mo
 share/locale/it/LC_MESSAGES/yelp.mo
 share/locale/ja/LC_MESSAGES/yelp.mo
 share/locale/ko/LC_MESSAGES/yelp.mo
 share/locale/lv/LC_MESSAGES/yelp.mo
+share/locale/mk/LC_MESSAGES/yelp.mo
 share/locale/ms/LC_MESSAGES/yelp.mo
 share/locale/nl/LC_MESSAGES/yelp.mo
 share/locale/nn/LC_MESSAGES/yelp.mo
@@ -175,6 +180,8 @@ share/sgml/docbook/yelp/yelp-custom.xsl
 share/sgml/docbook/yelp/yelp-customization.xsl
 share/yelp/catalog
 share/yelp/important_docs.xml
+share/yelp/ui/yelp.glade
+@dirrm share/yelp/ui
 @dirrm share/yelp
 @dirrm share/sgml/docbook/yelp/docbook/lib
 @dirrm share/sgml/docbook/yelp/docbook/images
@@ -226,6 +233,8 @@ share/yelp/important_docs.xml
 @comment @dirrm share/locale/nl
 @comment @dirrm share/locale/ms/LC_MESSAGES
 @comment @dirrm share/locale/ms
+@comment @dirrm share/locale/mk/LC_MESSAGES
+@comment @dirrm share/locale/mk
 @comment @dirrm share/locale/lv/LC_MESSAGES
 @comment @dirrm share/locale/lv
 @comment @dirrm share/locale/ko/LC_MESSAGES
@@ -236,12 +245,16 @@ share/yelp/important_docs.xml
 @comment @dirrm share/locale/it
 @comment @dirrm share/locale/hu/LC_MESSAGES
 @comment @dirrm share/locale/hu
+@comment @dirrm share/locale/hi/LC_MESSAGES
+@comment @dirrm share/locale/hi
 @comment @dirrm share/locale/he/LC_MESSAGES
 @comment @dirrm share/locale/he
 @comment @dirrm share/locale/gl/LC_MESSAGES
 @comment @dirrm share/locale/gl
 @comment @dirrm share/locale/fr/LC_MESSAGES
 @comment @dirrm share/locale/fr
+@comment @dirrm share/locale/fi/LC_MESSAGES
+@comment @dirrm share/locale/fi
 @comment @dirrm share/locale/et/LC_MESSAGES
 @comment @dirrm share/locale/et
 @comment @dirrm share/locale/es/LC_MESSAGES