diff --git a/.cvsignore b/.cvsignore
index 55db4c0..9c8172c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-Botan-1.8.7.tbz
+Botan-1.8.8.tbz
diff --git a/botan-1.8.8-binutils_lea_offset.patch b/botan-1.8.8-binutils_lea_offset.patch
new file mode 100644
index 0000000..2028a6f
--- /dev/null
+++ b/botan-1.8.8-binutils_lea_offset.patch
@@ -0,0 +1,28 @@
+#
+#
+# patch "src/hash/sha1_amd64/sha1_amd64_imp.S"
+#  from [dd263db10309950dec501dd9257a8df43cf6c6aa]
+#    to [ab1db7a394b41a1d3b9a63a6e8e1571e4671b962]
+#
+============================================================
+--- src/hash/sha1_amd64/sha1_amd64_imp.S	dd263db10309950dec501dd9257a8df43cf6c6aa
++++ src/hash/sha1_amd64/sha1_amd64_imp.S	ab1db7a394b41a1d3b9a63a6e8e1571e4671b962
+@@ -103,10 +103,16 @@ ALIGN;
+ 
+    subq $320, W
+ 
++/*
++* Using negative values for SHA-1 constants > 2^31 to work around
++* a bug in binutils not accepting large lea displacements.
++*   -0x70E44324 == 0x8F1BBCDC
++*   -0x359D3E2A == 0xCA62C1D6
++*/
+ #define MAGIC1 0x5A827999
+ #define MAGIC2 0x6ED9EBA1
+-#define MAGIC3 0x8F1BBCDC
+-#define MAGIC4 0xCA62C1D6
++#define MAGIC3 -0x70E44324
++#define MAGIC4 -0x359D3E2A
+ 
+ #define T %esi
+ #define T2 %eax
diff --git a/botan.spec b/botan.spec
index 419c12d..476abd4 100644
--- a/botan.spec
+++ b/botan.spec
@@ -1,12 +1,13 @@
 Name:           botan
-Version:        1.8.7
-Release:        1%{?dist}
+Version:        1.8.8
+Release:        2%{?dist}
 Summary:        Crypto library written in C++
 
 Group:          System Environment/Libraries
 License:        BSD
 URL:            http://botan.randombit.net/
 Source0:        http://files.randombit.net/botan/Botan-%{version}.tbz
+Patch0:         botan-1.8.8-binutils_lea_offset.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gcc-c++
@@ -45,6 +46,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q -n Botan-%{version}
+%patch0 -p0
 
 
 %build
@@ -110,6 +112,13 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} ./check --validate
 
 
 %changelog
+* Thu Nov 19 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.8-2
+- Add patch from upstream to build with binutils-2.20.51.0.2.
+  Fixes bz 538949 (ftbfs).
+
+* Thu Nov  5 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.8-1
+- Update to 1.8.8, a bugfix release.
+
 * Thu Sep 10 2009 Thomas Moschny <thomas.moschny@gmx.de> - 1.8.7-1
 - Update to 1.8.7. This is mainly a bugfix release.
 
diff --git a/import.log b/import.log
index 1af5f43..eab4eaa 100644
--- a/import.log
+++ b/import.log
@@ -5,3 +5,4 @@ botan-1_8_2-1_fc12:F-11:botan-1.8.2-1.fc12.src.rpm:1242458388
 botan-1_8_5-2_fc11:F-11:botan-1.8.5-2.fc11.src.rpm:1250100575
 botan-1_8_6-1_fc11:F-11:botan-1.8.6-1.fc11.src.rpm:1250179358
 botan-1_8_7-1_fc11:F-11:botan-1.8.7-1.fc11.src.rpm:1252624676
+botan-1_8_8-2_fc12:F-11:botan-1.8.8-2.fc12.src.rpm:1258665732
diff --git a/sources b/sources
index ec98c68..fddfa1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c607e31b012d9839fd0a1da24ff85e3d  Botan-1.8.7.tbz
+cb7cf79c34414cdf1f7a25569d7b82ac  Botan-1.8.8.tbz