diff --git a/libtool-1.5.24.diff b/libtool-1.5.24.diff
new file mode 100644
index 0000000..af90ab0
--- /dev/null
+++ b/libtool-1.5.24.diff
@@ -0,0 +1,24 @@
+--- tagdemo/foo.cpp
++++ tagdemo/foo.cpp
+@@ -20,7 +20,8 @@
+ // USA.
+ 
+ #include "foo.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ #ifdef HAVE_MATH_H
+ #include <math.h>
+--- tagdemo/main.cpp
++++ tagdemo/main.cpp
+@@ -22,7 +22,8 @@
+ 
+ #include "foo.h"
+ #include "baz.h"
+-#include <iostream.h>
++#include <iostream>
++using namespace std;
+ 
+ 
+ int
diff --git a/libtool.changes b/libtool.changes
index f182dfd..5f8d0a3 100644
--- a/libtool.changes
+++ b/libtool.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Nov 13 15:18:15 CET 2007 - schwab@suse.de
+
+- Fix C++ includes.
+
 -------------------------------------------------------------------
 Wed Jun 27 11:23:17 CEST 2007 - schwab@suse.de
 
diff --git a/libtool.spec b/libtool.spec
index 942303a..b3e0fd2 100644
--- a/libtool.spec
+++ b/libtool.spec
@@ -15,13 +15,13 @@ License:        GPL v2 or later
 Group:          Development/Tools/Building
 Summary:        A Tool to Build Shared Libraries
 Version:        1.5.24
-Release:        1
-Autoreqprov:    on
+Release:        23
+AutoReqProv:    on
 PreReq:         %{install_info_prereq}
 Requires:       libltdl-3 = %{version}
-URL:            http://www.gnu.org/software/libtool/
+Url:            http://www.gnu.org/software/libtool/
 Source:         ftp://ftp.gnu.org/pub/gnu/libtool/libtool-%{version}.tar.gz
-#Patch:          libtool-%{version}.diff
+Patch:          libtool-%{version}.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -43,7 +43,7 @@ Authors:
 %package -n libltdl-3
 Summary:        Libtool Runtime Library
 Group:          Development/Libraries/C and C++
-Autoreqprov:    on
+AutoReqProv:    on
 Provides:       libltdl
 Obsoletes:      libltdl <= 1.5.22
 
@@ -64,16 +64,13 @@ Authors:
 
 %prep
 %setup -q
-#%patch
+%patch
 
 %build
-# get the current config.guess & config.sub.
-# -f: don't look at the file timestamps (they might be wrong due to patches)
-%{?suse_update_config:%{suse_update_config -l -f}}
 ./configure CFLAGS="$RPM_OPT_FLAGS" \
    --prefix=/usr --infodir=%{_infodir} --libdir=%{_libdir}
 make
-make check
+make check VERBOSE=yes
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -109,6 +106,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libltdl.so.*
 
 %changelog
+* Tue Nov 13 2007 - schwab@suse.de
+- Fix C++ includes.
 * Wed Jun 27 2007 - schwab@suse.de
 - Update to libtool 1.5.24.
   * Initial support for Interix newer than version 3.