diff --git a/neon.spec b/neon.spec
index 064f721..1a9d780 100644
--- a/neon.spec
+++ b/neon.spec
@@ -11,7 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: expat-devel, gnutls-devel, zlib-devel, krb5-devel, libproxy-devel
 BuildRequires: pkgconfig, pakchois-devel
 Requires: ca-certificates
-Conflicts: subversion < 0.22.2-4
 
 %description
 neon is an HTTP and WebDAV client library, with a C interface;
@@ -25,7 +24,8 @@ Summary: Development libraries and C header files for the neon library
 Group: Development/Libraries
 Requires: neon = %{version}-%{release}, gnutls-devel, zlib-devel, expat-devel
 Requires: pkgconfig
-Conflicts: subversion-devel < 0.22.2-4
+# Documentation is GPLv2+
+License: LGPLv2+ and GPLv2+
 
 %description devel
 The development library for the C language HTTP and WebDAV client library.
@@ -78,6 +78,10 @@ rm -rf $RPM_BUILD_ROOT
 %changelog
 * Tue May  3 2011 Joe Orton <jorton@redhat.com> - 0.29.6-1
 - update to 0.29.6
+- correct -devel License; drop old Conflicts
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.29.5-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Thu Oct 14 2010 Joe Orton <jorton@redhat.com> - 0.29.5-1
 - update to 0.29.5