diff --git a/.gitignore b/.gitignore
index 38cde3a..66c145d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gdbm-1.8.3.tar.gz
+/gdbm-1.9.1.tar.gz
diff --git a/gdbm.spec b/gdbm.spec
index 1bcde13..4dbab4c 100644
--- a/gdbm.spec
+++ b/gdbm.spec
@@ -1,7 +1,7 @@
 Summary: A GNU set of database routines which use extensible hashing
 Name: gdbm
-Version: 1.8.3
-Release: 9%{?dist}
+Version: 1.9.1
+Release: 1%{?dist}
 Source: http://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
 # Prevent gdbm from storing uninitialized memory content
 # to database files.
@@ -11,21 +11,10 @@ Source: http://ftp.gnu.org/gnu/gdbm/gdbm-%{version}.tar.gz
 # from other applications. The patch is taken from Debian.
 # See https://bugzilla.redhat.com/show_bug.cgi?id=4457
 # See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=208927
-Patch0: gdbm-1.8.3-zeroheaders.patch
-# Make gdbm buildable. 
-Patch1: gdbm-1.8.3-fhs.patch
+Patch0: gdbm-1.9.1-zeroheaders.patch
 # Make gdbm handle read(2) returning less data than it was asked for.
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=274417
-Patch2: gdbm-1.8.3-shortread.patch
-# dbm_open compatibility function will not lock the database if
-# NDBM_LOCK environment variable is set to false. This is useful:
-# * old applications handle locks themselves (POSIX man page says that
-#   ndbm did not use to lock files, see dbm_clearerr(3p))
-# * locks are degrading performance a lot on NFS shares
-Patch3: gdbm-1.8.3-ndbmlock.patch
-# Prevent compilation of c++ files that use gdbm from warnings.
-# g++ compilator complained about the use of anonymous class
-Patch4: gdbm-1.8.3-filestruct.patch
+Patch1: gdbm-1.9.1-shortread.patch
 License: GPLv2+
 URL: http://www.gnu.org/software/gdbm/
 Group: System Environment/Libraries
@@ -60,35 +49,25 @@ gdbm database library.  You'll also need to install the gdbm package.
 %prep
 %setup -q
 %patch0 -p1 -b .zeroheaders
-%patch1 -p1 -b .fhs
-%patch2 -p1 -b .shortread
-%patch3 -p1 -b .ndbmlock
-%patch4 -p1 -b .filestruct
-
-libtoolize --force --copy
-aclocal
-autoconf
+%patch1 -p1 -b .shortread
 
 %build
-%configure --disable-static
-
-# flock does not work on nfs
-# fcntl should be used instead of it
-# see `man 2 flock`
-# rhbz#477300
-echo "/* We use fcntl locking (POSIX) instead of flock (BSD) */" >> autoconf.h
-echo "#undef HAVE_FLOCK" >> autoconf.h
+%configure --disable-static --enable-libgdbm-compat
 
 make
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-%makeinstall install-compat
-ln -sf gdbm/gdbm.h $RPM_BUILD_ROOT/%{_includedir}/gdbm.h
+%makeinstall 
 
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libgdbm.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/libgdbm_compat.la
 
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+
+%check
+make check
+
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
@@ -106,18 +85,27 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc COPYING NEWS README
-%{_libdir}/libgdbm.so.3*
-%{_libdir}/libgdbm_compat.so.3*
+%{_libdir}/libgdbm.so.4*
+%{_libdir}/libgdbm_compat.so.4*
+%{_bindir}/testgdbm
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libgdbm.so
 %{_libdir}/libgdbm_compat.so
 %{_includedir}/gdbm*
+%{_includedir}/dbm*
+%{_includedir}/ndbm*
 %{_infodir}/*.info*
 %{_mandir}/man3/*
 
 %changelog
+* Tue Sep 20 2011 Honza Horak <hhorak@redhat.com> - 1.9.1-1
+- Updated to new upstream release 1.9.1
+- Dropped -filestruct, -ndbmlock and -fhs patches, they are not 
+  needed anymore and GDBM_NOLOCK is used always
+- Run testsuite
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index b5d5986..11483c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1d1b1d5c0245b1c00aff92da751e9aa1  gdbm-1.8.3.tar.gz
+59f6e4c4193cb875964ffbe8aa384b58  gdbm-1.9.1.tar.gz