diff --git a/.cvsignore b/.cvsignore
index f462e2f..2bb0284 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 confuse-2.5.tar.gz
+confuse-2.6.tar.gz
diff --git a/libconfuse.spec b/libconfuse.spec
index 54b9ada..0a05b10 100644
--- a/libconfuse.spec
+++ b/libconfuse.spec
@@ -1,29 +1,29 @@
 Name:           libconfuse
-Version:        2.5
-Release:        3%{?dist}
+Version:        2.6
+Release:        1%{?dist}
 Summary:        A configuration file parser library
 
 Group:          System Environment/Libraries
-License:        LGPL
+License:        ISC
 URL:            http://www.nongnu.org/confuse/
-Source0:        http://download.savannah.nongnu.org/releases/confuse/confuse-%{version}.tar.gz
+Source0:        http://bzero.se/confuse/confuse-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  check-devel, pkgconfig
 
 %description
-libConfuse is a configuration file parser library, licensed 
-under the terms of the LGPL, and written in C. It supports 
-sections and (lists of) values (strings, integers, floats, 
-booleans or other sections), as well as some other features 
-(such as single/double-quoted strings, environment variable 
-expansion, functions and nested include statements). It 
-makes it very easy to add configuration file capability to 
-a program using a simple API.
-
-The goal of libConfuse is not to be the configuration file 
-parser library with a gazillion of features. Instead, it 
-aims to be easy to use and quick to integrate with your code. 
+libConfuse is a configuration file parser library, licensed under
+the terms of the ISC license, and written in C. It supports
+sections and (lists of) values (strings, integers, floats,
+booleans or other sections), as well as some other features (such
+as single/double-quoted strings, environment variable expansion,
+functions and nested include statements). It makes it very
+easy to add configuration file capability to a program using
+a simple API.
+
+The goal of libConfuse is not to be the configuration file parser
+library with a gazillion of features. Instead, it aims to be
+easy to use and quick to integrate with your code.
 
 %package devel
 Summary:        Development files for %{name}
@@ -41,7 +41,7 @@ perl -pi.orig -e 's|confuse.h|../src/confuse.h|g' tests/check_confuse.c
 
 %build
 %configure --enable-shared --disable-static
-make %{?_smp_mflags}
+make %{?_smp_mflags} AM_CFLAGS="-Wall -Wextra"
 
 %check
 make check
@@ -73,7 +73,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f confuse.lang
 %defattr(-,root,root,-)
-%doc ABOUT-NLS AUTHORS COPYING NEWS README
+%doc AUTHORS NEWS README
 %doc doc/html
 %{_libdir}/libconfuse.so.*
 %{_mandir}/man?/*.*
@@ -87,6 +87,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb 04 2008 Jarod Wilson <jwilson@redhat.com> 2.6-1
+- New upstream release
+- Switch from LGPL to ISC license
+- Build fix from Hans Ulrich Niedermann
+
 * Tue Sep 05 2006 Jarod Wilson <jwilson@redaht.com> 2.5-3
 - Rebuild for new glibc
 
diff --git a/sources b/sources
index ca0cb61..e68c81e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4bc9b73d77ebd571ac834619ce0b3582  confuse-2.5.tar.gz
+0e883d66f0f58fc33585b430c652aa30  confuse-2.6.tar.gz