diff --git a/libhugetlbfs-1.3.tar.bz2 b/libhugetlbfs-1.3.tar.bz2
deleted file mode 100644
index 1c7802a..0000000
--- a/libhugetlbfs-1.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4efd97608df6b10e747ac779bdc9fd903892333eaaa07bf81ef0d405448b2b65
-size 67682
diff --git a/libhugetlbfs-2.0.tar.bz2 b/libhugetlbfs-2.0.tar.bz2
new file mode 100644
index 0000000..e225fed
--- /dev/null
+++ b/libhugetlbfs-2.0.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8f3bbb5875217c314149fec87cc55a750a056f7dd84e446970c9a5006eb0c8c4
+size 76847
diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes
index ba3ff35..8732f82 100644
--- a/libhugetlbfs.changes
+++ b/libhugetlbfs.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Aug 27 18:33:12 CEST 2008 - olh@suse.de
+
+- update to version 2.0 (fate#304340)
+  New Features
+  * New scriptless relinking for binutils >= 2.17
+  * Added direct allocator API for huge pages
+
+  Bug Fixes
+  * /proc/mounts is parsed line at a time to handle file larger than 4kb
+  * Read-only mappings use MAP_NORESERVE
+
 -------------------------------------------------------------------
 Wed Jun 25 11:31:01 CEST 2008 - olh@suse.de
 
diff --git a/libhugetlbfs.ia64-libdir.patch b/libhugetlbfs.ia64-libdir.patch
new file mode 100644
index 0000000..e124125
--- /dev/null
+++ b/libhugetlbfs.ia64-libdir.patch
@@ -0,0 +1,15 @@
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -55,7 +55,7 @@ endif
+ else
+ ifeq ($(ARCH),ia64)
+ CC64 = gcc
+-LIB64 = lib64
++LIB64 = lib
+ CFLAGS += -DNO_ELFLINK
+ else
+ ifeq ($(ARCH),sparc64)
diff --git a/libhugetlbfs.install-header.patch b/libhugetlbfs.install-header.patch
new file mode 100644
index 0000000..4152dd7
--- /dev/null
+++ b/libhugetlbfs.install-header.patch
@@ -0,0 +1,16 @@
+---
+ Makefile |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -275,7 +275,8 @@ objscript.%: %
+ install: libs tools $(OBJDIRS:%=%/install) $(INSTALL_OBJSCRIPT:%=objscript.%)
+ 	@$(VECHO) INSTALL
+ 	$(INSTALL) -d $(DESTDIR)$(LDSCRIPTDIR)
+-	$(INSTALL) -m 644 $(INSTALL_HEADERS) $(HEADERDIR)
++	$(INSTALL) -d $(DESTDIR)$(HEADERDIR)
++	$(INSTALL) -m 644 $(INSTALL_HEADERS) $(DESTDIR)$(HEADERDIR)
+ 	$(INSTALL) -m 644 $(INSTALL_LDSCRIPTS:%=ldscripts/%) $(DESTDIR)$(LDSCRIPTDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(BINDIR)
+ 	$(INSTALL) -d $(DESTDIR)$(EXEDIR)
diff --git a/libhugetlbfs.s390.patch b/libhugetlbfs.s390.patch
new file mode 100644
index 0000000..46a9d2e
--- /dev/null
+++ b/libhugetlbfs.s390.patch
@@ -0,0 +1,27 @@
+---
+ Makefile |    6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/Makefile
++++ b/Makefile
+@@ -65,8 +65,11 @@ CFLAGS += -DNO_ELFLINK
+ else
+ ifeq ($(ARCH),s390x)
+ CC64 = gcc -m64
+-CC32 = gcc -m31
+ LIB64 = lib64
++CFLAGS += -DNO_ELFLINK
++else
++ifeq ($(ARCH),s390)
++CC32 = gcc -m31
+ LIB32 = lib
+ CFLAGS += -DNO_ELFLINK
+ else
+@@ -74,6 +77,7 @@ $(error "Unrecognized architecture ($(AR
+ endif
+ endif
+ endif
++endif
+ endif
+ endif
+ endif
diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec
index cbc071a..f30471a 100644
--- a/libhugetlbfs.spec
+++ b/libhugetlbfs.spec
@@ -1,10 +1,17 @@
 #
-# spec file for package libhugetlbfs (Version 1.3)
+# spec file for package libhugetlbfs (Version 2.0)
 #
 # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
@@ -16,12 +23,16 @@ BuildRequires:  doxygen
 License:        LGPL v2.1 or later
 Group:          Development/Libraries/Other
 Summary:        hugetlbfs helper library
-Version:        1.3
+Version:        2.0
 Release:        1
 Url:            http://libhugetlbfs.sourceforge.net/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %define my_make_flags V=1 CFLAGS="$RPM_OPT_FLAGS -g -fPIC" BUILDTYPE=NATIVEONLY PREFIX=/usr LIBDIR32=%{_libdir} DESTDIR=$RPM_BUILD_ROOT
 Source0:        libhugetlbfs-%{version}.tar.bz2
+Patch0:         libhugetlbfs.install-header.patch
+Patch1:         libhugetlbfs.ia64-libdir.patch
+Patch2:         libhugetlbfs.s390.patch
+Patch3:         libhugetlbfs.tests-malloc.patch
 
 %description
 libhugetlbfs interacts with the Linux hugetlbfs to make large pages
@@ -36,6 +47,10 @@ Authors:
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
 
 %build
 make %{my_make_flags} libs $tests
@@ -57,10 +72,19 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-, root, root)
 %doc LGPL-2.1 HOWTO README NEWS
 /usr/share/libhugetlbfs
+/usr/bin/*
 /usr/include/*
 %{_libdir}/lib*
 
 %changelog
+* Wed Aug 27 2008 olh@suse.de
+- update to version 2.0 (fate#304340)
+  New Features
+  * New scriptless relinking for binutils >= 2.17
+  * Added direct allocator API for huge pages
+  Bug Fixes
+  * /proc/mounts is parsed line at a time to handle file larger than 4kb
+  * Read-only mappings use MAP_NORESERVE
 * Wed Jun 25 2008 olh@suse.de
 - update to version 1.3
   New features
diff --git a/libhugetlbfs.tests-malloc.patch b/libhugetlbfs.tests-malloc.patch
new file mode 100644
index 0000000..98c689c
--- /dev/null
+++ b/libhugetlbfs.tests-malloc.patch
@@ -0,0 +1,15 @@
+---
+ tests/heapshrink-helper.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+--- a/tests/heapshrink-helper.c
++++ b/tests/heapshrink-helper.c
+@@ -21,5 +21,7 @@
+ 
+ static void __attribute__((constructor)) setup_heapshrink_helper(void)
+ {
+-	(void) malloc(1);
++	void *unused = malloc(1);
++	if (unused)
++		unused = NULL;
+ }