diff --git a/.cvsignore b/.cvsignore
index 034fe8c..af54b32 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-hdf5-1.6.7.tar.gz
+hdf5-1.6.9.tar.gz
diff --git a/hdf5-1.6.4-destdir.patch b/hdf5-1.6.4-destdir.patch
deleted file mode 100644
index 2a8e03a..0000000
--- a/hdf5-1.6.4-destdir.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- hdf5-1.6.4/config/commence.in.BAD	2005-04-03 13:52:00.000000000 -0500
-+++ hdf5-1.6.4/config/commence.in	2005-04-03 13:52:53.000000000 -0500
-@@ -35,11 +35,11 @@
- TRACE=:
- 
- ## Installation points
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--bindir=@bindir@
--libdir=@libdir@
--includedir=@includedir@
--docdir=@exec_prefix@/doc
-+prefix=$(DESTDIR)@prefix@
-+exec_prefix=$(DESTDIR)@exec_prefix@
-+bindir=$(DESTDIR)@bindir@
-+libdir=$(DESTDIR)@libdir@
-+includedir=$(DESTDIR)@includedir@
-+docdir=$(DESTDIR)@exec_prefix@/doc
- PUB_LIB=$(LIB)
- 
---- hdf5-1.6.4/fortran/config/commence.in.BAD	2005-04-03 14:08:27.000000000 -0500
-+++ hdf5-1.6.4/fortran/config/commence.in	2005-04-03 14:08:48.000000000 -0500
-@@ -40,11 +40,11 @@
- TRACE=:
- 
- ## Installation points
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--bindir=@bindir@
--libdir=@libdir@
--includedir=@includedir@
--docdir=@exec_prefix@/doc
-+prefix=$(DESTDIR)@prefix@
-+exec_prefix=$(DESTDIR)@exec_prefix@
-+bindir=$(DESTDIR)@bindir@
-+libdir=$(DESTDIR)@libdir@
-+includedir=$(DESTDIR)@includedir@
-+docdir=$(DESTDIR)@exec_prefix@/doc
- PUB_LIB=$(LIB)
- 
---- hdf5-1.6.4/c++/config/commence.in.BAD	2005-04-03 14:07:10.000000000 -0500
-+++ hdf5-1.6.4/c++/config/commence.in	2005-04-03 14:07:35.000000000 -0500
-@@ -32,11 +32,11 @@
- TRACE=:
- 
- ## Installation points
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--bindir=@bindir@
--libdir=@libdir@
--includedir=@includedir@
--docdir=@exec_prefix@/doc
-+prefix=$(DESTDIR)@prefix@
-+exec_prefix=$(DESTDIR)@exec_prefix@
-+bindir=$(DESTDIR)@bindir@
-+libdir=$(DESTDIR)@libdir@
-+includedir=$(DESTDIR)@includedir@
-+docdir=$(DESTDIR)@exec_prefix@/doc
- PUB_LIB=$(LIB)
- 
diff --git a/hdf5-1.6.4-norpath.patch b/hdf5-1.6.4-norpath.patch
deleted file mode 100644
index 3112889..0000000
--- a/hdf5-1.6.4-norpath.patch
+++ /dev/null
@@ -1,46 +0,0 @@
---- hdf5-1.6.4/config/commence.in.BAD	2005-04-03 18:55:35.000000000 -0500
-+++ hdf5-1.6.4/config/commence.in	2005-04-03 18:55:54.000000000 -0500
-@@ -48,8 +48,8 @@
- DYNAMIC_DIRS=@DYNAMIC_DIRS@
- LT=$(top_builddir)/libtool
- LT_COMPILE=$(LT) --mode=compile $(CC)
- LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS)
--LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS)
-+LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS)
- LT_RUN=$(LT) --mode=execute
- LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
- LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
---- hdf5-1.6.4/c++/config/commence.in.BAD	2005-04-03 18:55:05.000000000 -0500
-+++ hdf5-1.6.4/c++/config/commence.in	2005-04-03 18:55:25.000000000 -0500
-@@ -50,8 +50,8 @@
- DYNAMIC_DIRS=@DYNAMIC_DIRS@
- LT=$(top_builddir)/libtool
- LT_COMPILE=$(LT) --mode=compile $(CXX)
- LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
--LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
-+LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS)
- LT_RUN=$(LT) --mode=execute
- LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
- LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
---- hdf5-1.6.4/fortran/config/commence.in.BAD	2005-04-03 20:05:38.000000000 -0500
-+++ hdf5-1.6.4/fortran/config/commence.in	2005-04-03 20:05:48.000000000 -0500
-@@ -54,7 +54,7 @@
- LT=$(top_builddir)/libtool
- LT_CCOMPILE=$(LT) --mode=compile $(CC)
- LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir)
--LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir)
-+LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS)
- LT_RUN=$(LT) --mode=execute
- LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
- LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
---- hdf5-1.6.4/configure.norpath	2006-03-15 14:12:46.000000000 -0700
-+++ hdf5-1.6.4/configure	2006-03-15 14:14:09.000000000 -0700
-@@ -5569,7 +5569,7 @@
- 
-   if test "$ld_shlibs" = yes; then
-     runpath_var=LD_RUN_PATH
--    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-+    hardcode_libdir_flag_spec=''
-     export_dynamic_flag_spec='${wl}--export-dynamic'
-     case $host_os in
-     cygwin* | mingw* | pw32*)
diff --git a/hdf5-1.6.5-open.patch b/hdf5-1.6.5-open.patch
deleted file mode 100644
index a9637dc..0000000
--- a/hdf5-1.6.5-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- hdf5-1.6.5/perform/zip_perf.c.open	2007-08-08 14:55:09.000000000 -0600
-+++ hdf5-1.6.5/perform/zip_perf.c	2007-08-08 14:55:25.000000000 -0600
-@@ -545,7 +545,7 @@
-         unlink(filename);
- 
-         /* do compressed data write */
--        output = open(filename, O_RDWR | O_CREAT);
-+        output = open(filename, O_RDWR | O_CREAT, S_IRWXU);
- 
-         if (output == -1)
-             error(strerror(errno));
diff --git a/hdf5-1.6.9-destdir.patch b/hdf5-1.6.9-destdir.patch
new file mode 100644
index 0000000..c7eff2f
--- /dev/null
+++ b/hdf5-1.6.9-destdir.patch
@@ -0,0 +1,63 @@
+--- hdf5-1.6.9/c++/config/commence.in.destdir	2009-04-30 20:22:52.000000000 -0600
++++ hdf5-1.6.9/c++/config/commence.in	2009-06-02 10:48:57.014511985 -0600
+@@ -51,12 +51,12 @@
+ TRACE=:
+ 
+ ## Installation points
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-libdir=@libdir@
+-includedir=@includedir@
+-docdir=@exec_prefix@/doc
++prefix=$(DESTDIR)@prefix@
++exec_prefix=$(DESTDIR)@exec_prefix@
++bindir=$(DESTDIR)@bindir@
++libdir=$(DESTDIR)@libdir@
++includedir=$(DESTDIR)@includedir@
++docdir=$(DESTDIR)@exec_prefix@/doc
+ PUB_LIB=$(LIB)
+ 
+ ## Obtain default library; the current version of libtool does not fully
+--- hdf5-1.6.9/fortran/config/commence.in.destdir	2009-04-30 20:22:54.000000000 -0600
++++ hdf5-1.6.9/fortran/config/commence.in	2009-06-02 10:48:42.472512510 -0600
+@@ -58,12 +58,12 @@
+ TRACE=:
+ 
+ ## Installation points
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-libdir=@libdir@
+-includedir=@includedir@
+-docdir=@exec_prefix@/doc
++prefix=$(DESTDIR)@prefix@
++exec_prefix=$(DESTDIR)@exec_prefix@
++bindir=$(DESTDIR)@bindir@
++libdir=$(DESTDIR)@libdir@
++includedir=$(DESTDIR)@includedir@
++docdir=$(DESTDIR)@exec_prefix@/doc
+ PUB_LIB=$(LIB)
+ 
+ ## Shared libraries
+--- hdf5-1.6.9/config/commence.in.destdir	2009-04-30 20:22:31.000000000 -0600
++++ hdf5-1.6.9/config/commence.in	2009-06-02 10:47:54.591451873 -0600
+@@ -54,12 +54,12 @@
+ TRACE=:
+ 
+ ## Installation points
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-bindir=@bindir@
+-libdir=@libdir@
+-includedir=@includedir@
+-docdir=@exec_prefix@/doc
++prefix=$(DESTDIR)@prefix@
++exec_prefix=$(DESTDIR)@exec_prefix@
++bindir=$(DESTDIR)@bindir@
++libdir=$(DESTDIR)@libdir@
++includedir=$(DESTDIR)@includedir@
++docdir=$(DESTDIR)@exec_prefix@/doc
+ PUB_LIB=$(LIB)
+ 
+ ## Shared libraries
diff --git a/hdf5-1.6.9-norpath.patch b/hdf5-1.6.9-norpath.patch
new file mode 100644
index 0000000..b2424db
--- /dev/null
+++ b/hdf5-1.6.9-norpath.patch
@@ -0,0 +1,44 @@
+--- hdf5-1.6.9/config/commence.in.norpath	2009-06-02 10:51:25.431451460 -0600
++++ hdf5-1.6.9/config/commence.in	2009-06-02 10:53:49.177511893 -0600
+@@ -68,7 +68,7 @@
+ LT=$(top_builddir)/libtool
+ LT_COMPILE=$(LT) --mode=compile $(CC)
+ LT_LINK_LIB=$(LT) --mode=link $(CC) -rpath $(libdir) $(DYNAMIC_DIRS)
+-LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self -rpath $(libdir) $(DYNAMIC_DIRS)
++LT_LINK_EXE=$(LT) --mode=link $(CC) $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS)
+ LT_RUN=$(LT) --mode=execute
+ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+ LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+--- hdf5-1.6.9/c++/config/commence.in.norpath	2009-06-02 10:51:25.430452315 -0600
++++ hdf5-1.6.9/c++/config/commence.in	2009-06-02 10:54:41.521511096 -0600
+@@ -70,7 +70,7 @@
+ LT=$(top_builddir)/libtool
+ LT_COMPILE=$(LT) --mode=compile $(CXX)
+ LT_LINK_LIB=$(LT) --mode=link $(CXX) -static -rpath $(libdir) $(DYNAMIC_DIRS)
+-LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self -rpath $(bindir) $(DYNAMIC_DIRS)
++LT_LINK_EXE=$(LT) --mode=link $(CXX) -static $(LT_STATIC_EXEC) -dlopen self $(DYNAMIC_DIRS)
+ LT_RUN=$(LT) --mode=execute
+ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+ LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+--- hdf5-1.6.4/fortran/config/commence.in.BAD	2005-04-03 20:05:38.000000000 -0500
++++ hdf5-1.6.4/fortran/config/commence.in	2005-04-03 20:05:48.000000000 -0500
+@@ -54,7 +54,7 @@
+ LT=$(top_builddir)/libtool
+ LT_CCOMPILE=$(LT) --mode=compile $(CC)
+ LT_LINK_CLIB=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) $(LT_STATIC_EXEC) -rpath $(libdir)
+-LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS) -rpath $(bindir)
++LT_LINK_CEXE=$(LT) --mode=link $(CC) $(DYNAMIC_DIRS)
+ LT_RUN=$(LT) --mode=execute
+ LT_INSTALL_PROG=$(LT) --mode=install $(INSTALL_PROGRAM)
+ LT_INSTALL_LIB=$(LT) --mode=install $(INSTALL_DATA)
+--- hdf5-1.6.4/configure.norpath	2006-03-15 14:12:46.000000000 -0700
++++ hdf5-1.6.4/configure	2006-03-15 14:14:09.000000000 -0700
+@@ -5569,7 +5569,7 @@
+ 
+   if test "$ld_shlibs" = yes; then
+     runpath_var=LD_RUN_PATH
+-    hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
++    hardcode_libdir_flag_spec=''
+     export_dynamic_flag_spec='${wl}--export-dynamic'
+     case $host_os in
+     cygwin* | mingw* | pw32*)
diff --git a/hdf5.spec b/hdf5.spec
index f9eca57..e121cb0 100644
--- a/hdf5.spec
+++ b/hdf5.spec
@@ -1,17 +1,16 @@
 Name: hdf5
-Version: 1.6.8
+Version: 1.6.9
 Release: 1%{?dist}
 Summary: A general purpose library and file format for storing scientific data
 License: BSD
 Group: System Environment/Libraries
 URL: http://www.hdfgroup.org/HDF5/
 Source0: ftp://ftp.hdfgroup.org/HDF5/current16/src/%{name}-%{version}.tar.gz
-Patch1: hdf5-1.6.4-destdir.patch
-Patch2: hdf5-1.6.4-norpath.patch
+Patch1: hdf5-1.6.9-destdir.patch
+Patch2: hdf5-1.6.9-norpath.patch
 Patch5: hdf5-1.6.4-ppc.patch
 Patch7: hdf5-1.6.5-x86_64.patch
 Patch8: hdf5-1.6.5-sort.patch
-Patch10: hdf5-1.6.5-open.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: krb5-devel, openssl-devel, zlib-devel, gcc-gfortran, time
 
@@ -39,7 +38,6 @@ HDF5 development headers and libraries.
 %patch5 -p1 -b .ppc
 %patch7 -p1 -b .x86_64
 %patch8 -p1 -b .sort
-%patch10 -p1 -b .open
 
 
 %build
@@ -84,6 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/h5import
 %{_bindir}/h5jam
 %{_bindir}/h5ls
+%{_bindir}/h5perf
 %{_bindir}/h5repack
 %{_bindir}/h5repart
 %{_bindir}/h5unjam
@@ -103,6 +102,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 2 2009 Orion Poplawski <orion@cora.nwra.com> 1.6.9-1
+- Update to 1.6.9
+- Update destdir and norpath patches
+- Drop open patch fixed upstream
+- Ship h5perf
+
 * Sat Nov 15 2008 Orion Poplawski <orion@cora.nwra.com> 1.6.8-1
 - Update to 1.6.8
 
diff --git a/sources b/sources
index 9313fd6..78a493a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a822babf2810b509cc6779de739debd3  hdf5-1.6.8.tar.gz
+751eb3317a47e7c58978e1c3a13a93fc  hdf5-1.6.9.tar.gz