diff --git a/libhugetlbfs-2.11.tar.bz2 b/libhugetlbfs-2.11.tar.bz2
deleted file mode 100644
index cd8fb05..0000000
--- a/libhugetlbfs-2.11.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ced06da2cec31e9cdba3a508ef4601097abf77bc606776085e6d28875f9e69e1
-size 136008
diff --git a/libhugetlbfs-2.12.tar.gz b/libhugetlbfs-2.12.tar.gz
new file mode 100644
index 0000000..f976b4b
--- /dev/null
+++ b/libhugetlbfs-2.12.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f989909714a566e2ccac38a9094468db2047fb98cf1b10b60a6d445a9cc91928
+size 172852
diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes
index 84c0343..5eb6c93 100644
--- a/libhugetlbfs.changes
+++ b/libhugetlbfs.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Oct 12 20:04:52 UTC 2011 - tabraham@novell.com
+
+- Update to version 2.12
+  * libhugetlbfs usages can now be restricted to certain binary names
+  * libhugetlbfs now supports static linking
+  * hugeadm uses more human readable directory names for mount points
+  * Fix segfault if specified user was not in passwd, failuer in
+    getpwuid() is now checked
+  * Added tests for static linking to testcase
+  * Added missing tests to driver script
+
 -------------------------------------------------------------------
 Sun May 29 21:42:52 UTC 2011 - meissner@novell.com
 
diff --git a/libhugetlbfs.run_test_fix.patch b/libhugetlbfs.run_test_fix.patch
deleted file mode 100644
index aadbb25..0000000
--- a/libhugetlbfs.run_test_fix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-run_test.sh vs run_test.ph typo in install Makefile part
-
-
-Signed-off-by: Thomas Renninger <trenn@suse.de>
-
----
- tests/Makefile |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: libhugetlbfs-2.5/tests/Makefile
-===================================================================
---- libhugetlbfs-2.5.orig/tests/Makefile
-+++ libhugetlbfs-2.5/tests/Makefile
-@@ -223,7 +223,7 @@ obj32/install:
- 	$(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR32)/obj32
- 	$(INSTALL) -m 755 $(HELPERS:%=obj32/%) $(DESTDIR)$(INST_TESTSDIR32)/obj32
- 	$(INSTALL) -m 755 $(HELPER_LIBS:%=obj32/%) $(DESTDIR)$(INST_TESTSDIR32)/obj32
--	$(INSTALL) -m 755 run_tests.sh $(DESTDIR)$(INST_TESTSDIR32)
-+	$(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR32)
- 
- obj64/install:
- 	@$(VECHO) INSTALL64 $(INST_TESTSDIR64)
-@@ -235,6 +235,6 @@ obj64/install:
- 	$(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
- 	$(INSTALL) -m 755 $(HELPER_LIBS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
- 	$(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64
--	$(INSTALL) -m 755 run_tests.sh $(DESTDIR)$(INST_TESTSDIR64)
-+	$(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64)
- 
- install: $(OBJDIRS:%=%/install)
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index c16ed15..5ed6ed4 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -19,7 +19,12 @@
 
 
 Name:           libhugetlbfs
+
+%if 0%{?suse_version} > 1140
+BuildRequires:  glibc-devel-static
+%endif
 BuildRequires:  doxygen
+
 License:        LGPLv2.1+
 Group:          Development/Libraries/Other
 Summary:        Hugetlbfs helper library
@@ -28,17 +33,16 @@ Summary:        Hugetlbfs helper library
 Obsoletes:      libhugetlbfs-64bit
 %endif
 #
-Version:        2.11
-Release:        3
+Version:        2.12
+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
-Source0:        libhugetlbfs-%{version}.tar.bz2
+Source0:        libhugetlbfs-%{version}.tar.gz
 Source1:        baselibs.conf
 Patch1:         libhugetlbfs.ia64-libdir.patch
 Patch2:         libhugetlbfs.s390.patch
 Patch4:         libhugetlbfs.tests-malloc.patch
-Patch5:         libhugetlbfs.run_test_fix.patch
 
 %description
 The libhugetlbfs package interacts with the Linux hugetlbfs to
@@ -59,7 +63,6 @@ Devel package, header and static library, of libhugetlb
 %patch1 -p1
 %patch2 -p1
 %patch4 -p1
-%patch5 -p1
 
 %build
 make %{my_make_flags}