diff --git a/.cvsignore b/.cvsignore
index 3f8b193..c044f3a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-neon-0.24.7.tar.gz
+neon-0.25.5.tar.gz
+i386
diff --git a/Makefile b/Makefile
index 92cbb57..b85bfd2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for source rpm: neon
-# $Id: Makefile,v 1.1 2004/09/09 09:05:11 cvsdist Exp $
+# $Id: Makefile,v 1.1 2006/01/19 17:30:24 jorton Exp $
 NAME := neon
 SPECFILE = $(firstword $(wildcard *.spec))
 UPSTREAM_CHECKS = asc
diff --git a/neon-0.25.5.tar.gz.asc b/neon-0.25.5.tar.gz.asc
new file mode 100644
index 0000000..446dac5
--- /dev/null
+++ b/neon-0.25.5.tar.gz.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQBD0SYeR/aWnQ5EzwwRAoOBAJ4ooYlHPk7mx9aF8K2ZqdTl3aMkqACgwqBS
+BQFhzqi8RDdrFGZ5mXY7ezQ=
+=hxRE
+-----END PGP SIGNATURE-----
diff --git a/neon.spec b/neon.spec
index 6e37b88..5a84dbd 100644
--- a/neon.spec
+++ b/neon.spec
@@ -1,15 +1,12 @@
 Summary: An HTTP and WebDAV client library
 Name: neon
-Version: 0.24.7
-Release: 10.1
+Version: 0.25.5
+Release: 1
 License: LGPL
 Group: Applications/Publishing
 Prefix: %{_prefix}
 URL: http://www.webdav.org/neon/
 Source0: http://www.webdav.org/neon/neon-%{version}.tar.gz
-Patch0: neon-0.23.9-config.patch
-Patch1: neon-0.24.7-gssapi.patch
-Patch2: neon-0.24.7-min.patch
 BuildRequires: expat-devel, openssl-devel, zlib-devel, krb5-devel
 BuildRequires: pkgconfig
 BuildRoot: %{_tmppath}/%{name}-root
@@ -33,13 +30,9 @@ The development library for the C language HTTP and WebDAV client library.
 
 %prep
 %setup -q
-%patch0 -p1 -b .config
-%patch1 -p1 -b .gssapi
-%patch2 -p1 -b .min
 
 %build
-export CFLAGS="-Wall $RPM_OPT_FLAGS"
-%configure --with-ssl --with-expat --enable-shared
+%configure --with-ssl --with-expat --enable-shared --enable-warnings
 make %{?_smp_mflags}
 
 %install
@@ -81,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 
 %changelog
+* Tue Jan 31 2006 Joe Orton <jorton@redhat.com> 0.25.5-1
+- update to 0.25.5
+
 * Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
 - rebuilt
 
diff --git a/sources b/sources
index cc076b5..f55b3fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5108bcbe41de4afe2e19cc58500fb9f2  neon-0.24.7.tar.gz
+b5fdb71dd407f0a3de0f267d27c9ab17  neon-0.25.5.tar.gz
diff --git a/upstream b/upstream
index 3f8b193..2e00f66 100644
--- a/upstream
+++ b/upstream
@@ -1 +1 @@
-neon-0.24.7.tar.gz
+neon-0.25.5.tar.gz