diff --git a/devel/libgsf/Makefile b/devel/libgsf/Makefile
index 327475d64ec3..e7052e6a04cc 100644
--- a/devel/libgsf/Makefile
+++ b/devel/libgsf/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgsf
-PORTVERSION=	1.5.0
+PORTVERSION=	1.6.0
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +23,7 @@ INSTALLS_SHLIB=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehack
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
+CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc/gsf \
 		--disable-gtk-doc --with-gnome
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/devel/libgsf/distinfo b/devel/libgsf/distinfo
index 5b825e69db68..dab04be51e5b 100644
--- a/devel/libgsf/distinfo
+++ b/devel/libgsf/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgsf-1.5.0.tar.bz2) = 6f5413145356cde007d58251103290c1
+MD5 (gnome2/libgsf-1.6.0.tar.bz2) = 530c8c6ef9e919fb1a32f3d2993043f3
diff --git a/devel/libgsf/files/patch-configure b/devel/libgsf/files/patch-configure
index a6571af2dadb..2c312dcc0109 100644
--- a/devel/libgsf/files/patch-configure
+++ b/devel/libgsf/files/patch-configure
@@ -1,9 +1,6 @@
-
-$FreeBSD$
-
---- configure	2002/09/11 10:13:57	1.1
-+++ configure	2002/09/11 10:14:44
-@@ -7245,6 +7245,7 @@
+--- configure.orig	Tue Dec 10 17:56:28 2002
++++ configure	Wed Dec 25 03:03:11 2002
+@@ -7565,6 +7565,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
@@ -11,10 +8,10 @@ $FreeBSD$
  
  # Always use our own libtool.
  LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -8011,7 +8012,7 @@
- else
+@@ -8279,7 +8280,7 @@
    echo "$as_me: failed program was:" >&5
- cat conftest.$ac_ext >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
 -need_posix=yes
 +need_posix=no
  fi
diff --git a/devel/libgsf/files/patch-doc::Makefile.in b/devel/libgsf/files/patch-doc::Makefile.in
deleted file mode 100644
index fd4df53319b5..000000000000
--- a/devel/libgsf/files/patch-doc::Makefile.in
+++ /dev/null
@@ -1,16 +0,0 @@
-
-$FreeBSD$
-
---- doc/Makefile.in	2002/09/11 10:43:41	1.1
-+++ doc/Makefile.in	2002/09/11 14:47:40
-@@ -151,8 +151,8 @@
- #
- GPATH = $(srcdir)
- 
--TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
--DOC_DIR = $(datadir)/doc$(TARGET_DIR)
-+TARGET_DIR = $(DOC_MODULE)
-+DOC_DIR = $(datadir)/doc/$(TARGET_DIR)
- 
- EXTRA_DIST =  	$(content_files)			$(extra_files)				$(HTML_IMAGES)				$(DOC_MAIN_SGML_FILE)			$(DOC_MODULE).types			$(DOC_MODULE)-sections.txt		$(DOC_MODULE)-overrides.txt
- 
diff --git a/devel/libgsf/pkg-plist b/devel/libgsf/pkg-plist
index 8385ce465644..74642042def2 100644
--- a/devel/libgsf/pkg-plist
+++ b/devel/libgsf/pkg-plist
@@ -3,7 +3,6 @@ include/libgsf-1/gsf-gnome/gsf-input-gnomevfs.h
 include/libgsf-1/gsf-gnome/gsf-output-bonobo.h
 include/libgsf-1/gsf-gnome/gsf-output-gnomevfs.h
 include/libgsf-1/gsf-gnome/gsf-shared-bonobo-stream.h
-include/libgsf-1/gsf/gsf-command-context.h
 include/libgsf-1/gsf/gsf-doc-meta-data.h
 include/libgsf-1/gsf/gsf-impl-utils.h
 include/libgsf-1/gsf/gsf-infile-msole.h
@@ -15,12 +14,13 @@ include/libgsf-1/gsf/gsf-input-memory.h
 include/libgsf-1/gsf/gsf-input-stdio.h
 include/libgsf-1/gsf/gsf-input-textline.h
 include/libgsf-1/gsf/gsf-input.h
-include/libgsf-1/gsf/gsf-io-context.h
 include/libgsf-1/gsf/gsf-libxml.h
 include/libgsf-1/gsf/gsf-msole-utils.h
 include/libgsf-1/gsf/gsf-outfile-msole.h
 include/libgsf-1/gsf/gsf-outfile-zip.h
 include/libgsf-1/gsf/gsf-outfile.h
+include/libgsf-1/gsf/gsf-output-gzip.h
+include/libgsf-1/gsf/gsf-output-iochannel.h
 include/libgsf-1/gsf/gsf-output-memory.h
 include/libgsf-1/gsf/gsf-output-stdio.h
 include/libgsf-1/gsf/gsf-output.h
@@ -30,10 +30,10 @@ include/libgsf-1/gsf/gsf-utils.h
 include/libgsf-1/gsf/gsf.h
 lib/libgsf-1.a
 lib/libgsf-1.so
-lib/libgsf-1.so.6
+lib/libgsf-1.so.7
 lib/libgsf-gnome-1.a
 lib/libgsf-gnome-1.so
-lib/libgsf-gnome-1.so.6
+lib/libgsf-gnome-1.so.7
 libdata/pkgconfig/libgsf-1.pc
 libdata/pkgconfig/libgsf-gnome-1.pc
 share/doc/gsf/gsf-gsf-impl-utils.html