diff --git a/libhugetlbfs-2.5.tar.bz2 b/libhugetlbfs-2.5.tar.bz2
deleted file mode 100644
index c93f001..0000000
--- a/libhugetlbfs-2.5.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ad8e216c4e13fad67326986c0ff5ec6eda40b2458b7e3f435f8dc751e1abe724
-size 116809
diff --git a/libhugetlbfs-2.9.tar.bz2 b/libhugetlbfs-2.9.tar.bz2
new file mode 100644
index 0000000..9a985ba
--- /dev/null
+++ b/libhugetlbfs-2.9.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e42473762f99627439885254307935de769f44355ceb6603070c1f135bda9629
+size 134150
diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes
index e0694a2..0b37e51 100644
--- a/libhugetlbfs.changes
+++ b/libhugetlbfs.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Oct  6 16:52:30 UTC 2010 - aj@suse.de
+
+- Update to version 2.9:
+  * Add --no-reseve to hugectl to request mmap'd pages are not reserved
+    for kernels newer than 2.6.34
+  * Add --obey-numa-mempol to hugeadm to request static pool pages are
+    allocated following the process NUMA memory policy
+  * Add switch to let administrator limit new mount points by size or inodes
+  * cpupcstat now caches the value returned by tlmiss_cost.sh to avoid
+    rerunning the script
+  * When specifying huge page pool sizes with hugeadm, memory sizes can
+    be used as well as the number of huge pages
+  * DEFAULT is now a valid huge page pool for resizing, it will adjust
+    the pool for the default huge page size
+  * tlbmiss_cost.sh in the contrib/ sub directory will estimate the cost
+    in CPU cycles of a TLB miss on the arch where it is run
+  * Add python script which automates huge page pool setup with minimal
+    input required from user
+  * cpupcstat now supports data collection using the perf tool as well as
+    oprofile
+  * --explain reports if min_free_kbytes is too small
+  * add --set-min_free_kbytes to hugeadm
+
 -------------------------------------------------------------------
 Fri Jun 18 14:41:41 UTC 2010 - coolo@novell.com
 
diff --git a/libhugetlbfs.exchange_library_order.patch b/libhugetlbfs.exchange_library_order.patch
deleted file mode 100644
index 735360c..0000000
--- a/libhugetlbfs.exchange_library_order.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Force --no-as-needed linker option
-
-Otherwise things won't link.
-Having --as-needed be set in a build environment can give you
-quite some headache to find out why it links the one, but not
-the other way.
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-
----
- tests/Makefile |   14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-Index: libhugetlbfs-2.5/tests/Makefile
-===================================================================
---- libhugetlbfs-2.5.orig/tests/Makefile
-+++ libhugetlbfs-2.5/tests/Makefile
-@@ -26,7 +26,7 @@ BADTOOLCHAIN = bad-toolchain.sh
- 
- CFLAGS = -O2 -Wall -g
- CPPFLAGS = -I..
--LDLIBS = -ldl -lpthread -lhugetlbfs_privutils
-+LDLIBS = -Wl,--no-as-needed -ldl -lpthread -lhugetlbfs_privutils
- LDFLAGS32 = -L../obj32
- LDFLAGS64 = -L../obj64
- INSTALL = install
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index 47c493b..c38bac9 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package libhugetlbfs (Version 2.5)
+# spec file for package libhugetlbfs (Version 2.9)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -28,8 +28,8 @@ Summary:        Hugetlbfs helper library
 Obsoletes:      libhugetlbfs-64bit
 %endif
 #
-Version:        2.5
-Release:        4
+Version:        2.9
+Release:        1
 Url:            http://libhugetlbfs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define my_make_flags V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" BUILDTYPE=NATIVEONLY PREFIX=/usr LIBDIR32=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
@@ -37,7 +37,6 @@ Source0:        libhugetlbfs-%{version}.tar.bz2
 Source1:        baselibs.conf
 Patch1:         libhugetlbfs.ia64-libdir.patch
 Patch2:         libhugetlbfs.s390.patch
-Patch3:         libhugetlbfs.exchange_library_order.patch
 Patch4:         libhugetlbfs.tests-malloc.patch
 Patch5:         libhugetlbfs.run_test_fix.patch
 
@@ -59,10 +58,8 @@ Devel package, header and static library, of libhugetlb
 %setup -q
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 %patch4 -p1
 %patch5 -p1
-#%patch7 -p1
 
 %build
 make %{my_make_flags}
@@ -95,13 +92,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man*/*.gz
 %{_libdir}/libhugetlbfs_privutils.so
 %{_libdir}/libhugetlbfs.so
-%{_libdir}/libhugetlbfs
+%dir %{_libdir}/libhugetlbfs
 %{_libdir}/libhugetlbfs/*
 # ToDo: What are these for...
 %dir /usr/lib/perl5/TLBC
 /usr/lib/perl5/TLBC/DataCollect.pm
 /usr/lib/perl5/TLBC/OpCollect.pm
 /usr/lib/perl5/TLBC/Report.pm
+/usr/lib/perl5/TLBC/PerfCollect.pm
 
 %files libhugetlb-devel
 %defattr(-, root, root)