diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index d7dd7a1c303..bead908ef4b 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -1,20 +1,20 @@
-# $OpenBSD: Makefile,v 1.25 2007/11/13 14:06:21 steven Exp $
+# $OpenBSD: Makefile,v 1.26 2008/05/12 16:43:57 fgsch Exp $
 
 COMMENT-main=		GNOME Structured File library
 COMMENT-gnome=		GNOME specific extensions to libgsf
 
-VERSION=		1.14.3
+VERSION=		1.14.4
 DISTNAME=		libgsf-${VERSION}
-PKGNAME-main=		${DISTNAME}p4
-PKGNAME-gnome=		libgsf-gnome-${VERSION}p3
-SHARED_LIBS +=  gsf-1                114.3     # .114.3
-SHARED_LIBS +=  gsf-gnome-1          114.3     # .114.3
+PKGNAME-main=		${DISTNAME}
+PKGNAME-gnome=		libgsf-gnome-${VERSION}
+SHARED_LIBS +=  gsf-1                114.4     # .114.4
+SHARED_LIBS +=  gsf-gnome-1          114.4     # .114.4
 
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gnome.org/
 
-# LGPL
+# LGPL 2.1
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
@@ -35,9 +35,11 @@ LIB_DEPENDS=		bz2.>=10.2::archivers/bzip2 \
 			glib-2.0.>=0.12,gobject-2.0.>=0.12::devel/glib2 \
 			xml2.>=8.4::textproc/libxml
 
+AUTOCONF_VERSION =	2.61
+
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoconf
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
 CONFIGURE_ARGS+=	--with-bz2 \
 			--disable-schemas-install \
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index d2a25db3dbe..2d8bca92b79 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1,5 +1,5 @@
-MD5 (libgsf-1.14.3.tar.bz2) = xwen/8Piv4AlVrroakUwIA==
-RMD160 (libgsf-1.14.3.tar.bz2) = tXXlWyMVLCkq5tZ/kGvM2VyokDA=
-SHA1 (libgsf-1.14.3.tar.bz2) = wL/DWVpH2EJa/O56kDUsF5Z3xFI=
-SHA256 (libgsf-1.14.3.tar.bz2) = kGE5qG3a3BJdWt4+u70PK/B0nxLghZIVfkIozRfTGOQ=
-SIZE (libgsf-1.14.3.tar.bz2) = 543791
+MD5 (libgsf-1.14.4.tar.bz2) = LQetLxM2wQHOFJgrpyifgA==
+RMD160 (libgsf-1.14.4.tar.bz2) = w9DWLFuewhzOoF3dTTV4hQcTszw=
+SHA1 (libgsf-1.14.4.tar.bz2) = aE2JyPuaf+M8g9gQ5FQBiJx5T+I=
+SHA256 (libgsf-1.14.4.tar.bz2) = 5o7oJr2iQayEdCAEPwM1wchM337nctZyrjkv8hgV5/A=
+SIZE (libgsf-1.14.4.tar.bz2) = 543158
diff --git a/devel/libgsf/patches/patch-configure_in b/devel/libgsf/patches/patch-configure_in
new file mode 100644
index 00000000000..8adfcaf3b6d
--- /dev/null
+++ b/devel/libgsf/patches/patch-configure_in
@@ -0,0 +1,19 @@
+$OpenBSD: patch-configure_in,v 1.1 2008/05/12 16:43:57 fgsch Exp $
+--- configure.in.orig	Thu May  8 11:37:27 2008
++++ configure.in	Thu May  8 11:42:27 2008
+@@ -377,7 +377,6 @@ else
+ 	*) AC_MSG_ERROR(bad value ${withval} for --with-bonobo) ;;
+ 	esac],
+ 	[WITH_BONOBO=yes]) dnl Default value
+-    AM_CONDITIONAL(WITH_BONOBO, test $WITH_BONOBO = yes)
+ 
+     if test $WITH_BONOBO = yes; then
+ 	libgsf_gnome_reqs="$libgsf_gnome_reqs libbonobo-2.0 >= 2.0.0"
+@@ -391,6 +390,7 @@ else
+ 	    AC_MSG_WARN([GNOME support disabled, unable to find required version of VFS and/or Bonobo])
+ 	 fi])
+ fi
++AM_CONDITIONAL(WITH_BONOBO, test x"$WITH_BONOBO" != x"no")
+ AM_CONDITIONAL(WITH_LIBGSF_GNOME, test $have_gnome = yes)
+ 
+ # ===================
diff --git a/devel/libgsf/pkg/PLIST-main b/devel/libgsf/pkg/PLIST-main
index bcdb4f92065..c4a25204568 100644
--- a/devel/libgsf/pkg/PLIST-main
+++ b/devel/libgsf/pkg/PLIST-main
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST-main,v 1.4 2007/05/09 22:00:01 alek Exp $
+@comment $OpenBSD: PLIST-main,v 1.5 2008/05/12 16:43:57 fgsch Exp $
 @pkgpath devel/libgsf
 @pkgpath devel/libgsf,no_gnome
 %%SHARED%%
@@ -22,6 +22,7 @@ include/libgsf-1/gsf/gsf-infile-zip.h
 include/libgsf-1/gsf/gsf-infile.h
 include/libgsf-1/gsf/gsf-input-bzip.h
 include/libgsf-1/gsf/gsf-input-gzip.h
+include/libgsf-1/gsf/gsf-input-http.h
 include/libgsf-1/gsf/gsf-input-impl.h
 include/libgsf-1/gsf/gsf-input-iochannel.h
 include/libgsf-1/gsf/gsf-input-memory.h
@@ -32,6 +33,7 @@ include/libgsf-1/gsf/gsf-input.h
 include/libgsf-1/gsf/gsf-libxml.h
 include/libgsf-1/gsf/gsf-meta-names.h
 include/libgsf-1/gsf/gsf-msole-utils.h
+include/libgsf-1/gsf/gsf-open-pkg-utils.h
 include/libgsf-1/gsf/gsf-opendoc-utils.h
 include/libgsf-1/gsf/gsf-outfile-impl.h
 include/libgsf-1/gsf/gsf-outfile-msole.h
@@ -53,7 +55,6 @@ include/libgsf-1/gsf/gsf-utils.h
 include/libgsf-1/gsf/gsf.h
 lib/libgsf-1.a
 lib/libgsf-1.la
-lib/pkgconfig/
 lib/pkgconfig/libgsf-1.pc
 lib/python${MODPY_VERSION}/site-packages/gsf/
 lib/python${MODPY_VERSION}/site-packages/gsf/__init__.py
@@ -85,6 +86,7 @@ share/gtk-doc/html/gsf/gsf-Text.html
 share/gtk-doc/html/gsf/gsf-XML-and-libxml.html
 share/gtk-doc/html/gsf/gsf-Zip.html
 share/gtk-doc/html/gsf/gsf-blobs.html
+share/gtk-doc/html/gsf/gsf-index.html
 share/gtk-doc/html/gsf/gsf-memory.html
 share/gtk-doc/html/gsf/gsf-metadata.html
 share/gtk-doc/html/gsf/gsf-users.html
@@ -97,7 +99,6 @@ share/gtk-doc/html/gsf/index.html
 share/gtk-doc/html/gsf/index.sgml
 share/gtk-doc/html/gsf/intro.html
 share/gtk-doc/html/gsf/io.html
-share/gtk-doc/html/gsf/ix01.html
 share/gtk-doc/html/gsf/left.png
 share/gtk-doc/html/gsf/misc.html
 share/gtk-doc/html/gsf/parsers.html