diff --git a/.gitignore b/.gitignore
index b2afcb5..feb0a86 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ avalon-site
 noarch
 *.src.rpm
 avalon-logkit-notarget.patch
+avalon-logkit-2.1-src.zip
diff --git a/avalon-logkit-build.patch b/avalon-logkit-build.patch
deleted file mode 100644
index 385e2f3..0000000
--- a/avalon-logkit-build.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- build.xml	Thu Jan 31 17:18:19 2002
-+++ build.xml.new	Sun Feb  3 14:10:47 2002
-@@ -260,10 +260,6 @@
-            optimize="${optimize}"
-            deprecation="${deprecation}"
-            target="1.2">
--      <classpath>
--        <path refid="project.class.path" />
--        <path refid="tools.class.path"/>
--      </classpath>
-       <src path="${test.dir}"/>
-       <src path="${compat.dir}"/>
-       <exclude name="org/apache/log/output/ServletOutputLogTarget.java"
diff --git a/avalon-logkit-javadoc.patch b/avalon-logkit-javadoc.patch
deleted file mode 100644
index 9d828b0..0000000
--- a/avalon-logkit-javadoc.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- LogKit-1.2/build.xml~	2005-07-04 12:58:51.000000000 +0100
-+++ LogKit-1.2/build.xml	2005-07-04 13:35:40.000000000 +0100
-@@ -467,6 +467,7 @@
-              sourcepath="${build.src}"
-              destdir="${build.javadocs}">
-       <classpath refid="project.class.path" />
-+<!--
-       <doclet name="com.sun.tools.doclets.standard.Standard">
-         <param name="-author"/>
-         <param name="-version"/>
-@@ -478,6 +479,7 @@
-         <param name="-link" value="http://java.sun.com/j2ee/sdk_1.3/techdocs/api/"/>
-         <param name="-link" value="http://avalon.apache.org/api/"/>
-       </doclet>
-+-->
-     </javadoc>
- 
-   </target>
diff --git a/avalon-logkit.spec b/avalon-logkit.spec
index c538fd1..db43150 100644
--- a/avalon-logkit.spec
+++ b/avalon-logkit.spec
@@ -32,17 +32,15 @@
 %global     camelcase_short_name      LogKit
 
 Name:        avalon-%{short_name}
-Version:     1.2
-Release:     9%{?dist}
+Version:     2.1
+Release:     1%{?dist}
 Epoch:       0
 Summary:     Java logging toolkit
 License:     ASL 1.1
-Group:       Development/Libraries/Java
-Url:         http://avalon.apache.org/%{short_name}/
-Source0:     http://www.apache.org/dist/avalon/logkit/LogKit-1.2-src.tar.gz
-Patch0:      %{name}-build.patch
-Patch1:      %{name}-javadoc.patch
-Patch2:      %{name}-notarget.patch
+Group:       Development/Libraries
+URL:         http://avalon.apache.org/%{short_name}/
+Source0:     http://www.apache.org/dist/excalibur/%{name}/source/%{name}-%{version}-src.zip
+Patch0:      fix-java6-compile.patch
 Requires:    avalon-framework >= 0:4.1.4
 Requires:    servlet25
 Requires:    jms
@@ -67,36 +65,33 @@ that you read the whitepaper and browse the API docs.
 
 %package javadoc
 Summary:    Javadoc for %{name}
-Group:        Development/Documentation
+Group:        Documentation
 Requires:     jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
 
 %prep
-%setup -q -n %{camelcase_short_name}-%{version}
-
+%setup -q 
 %patch0
-%patch1 -p1
-%patch2 -p1
 
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
 %build
 export CLASSPATH=%(build-classpath log4j javamail/mailapi jms tomcat6-servlet-2.5-api jdbc-stdext avalon-framework junit):$PWD/build/classes
-ant clean jar javadocs
+ant -Dnoget=true clean jar javadoc
 
 %install
 rm -rf $RPM_BUILD_ROOT
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/lib/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
+install -m 644 target/%{name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
 (cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
+cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 %clean
@@ -104,16 +99,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc KEYS LICENSE
+%doc LICENSE.txt NOTICE.txt
 %{_javadir}/*
 
 %files javadoc
 %defattr(-,root,root,-)
-%doc LICENSE
+%doc LICENSE.txt
 %{_javadocdir}/%{name}
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Tue Nov 9 2010 Alexander Kurtakov <akurtako@redhat.com> 0:2.1-1
+- Update to 2.1 (rhbz#599622).
+
 * Tue Nov  9 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0:1.2-9
 - Fix build to use tomcat6
 - Cleanups, various packaging problems fixed
diff --git a/fix-java6-compile.patch b/fix-java6-compile.patch
new file mode 100644
index 0000000..87bd582
--- /dev/null
+++ b/fix-java6-compile.patch
@@ -0,0 +1,13 @@
+--- src/java/org/apache/log/output/db/DefaultDataSource.java.sav	2005-08-29 21:03:50.000000000 +0300
++++ src/java/org/apache/log/output/db/DefaultDataSource.java	2010-11-09 21:05:58.775055594 +0200
+@@ -111,4 +111,10 @@ public class DefaultDataSource
+     {
+         m_logWriter = logWriter;
+     }
++    
++    public boolean isWrapperFor(Class<?> iface) {
++    	return false;
++    }
++
++    public <T> T unwrap(java.lang.Class<T> iface) {return null;}
+ }
diff --git a/sources b/sources
index ff2942b..dc31b2b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-17ede0a7d297ad610b47c476757c2b96  LogKit-1.2-src.tar.gz
-38fad6c89dbc762ebe3c148f5965792e  avalon-logkit-notarget.patch
+b30646d4c5bb7fabeda1efb01f4167b9  avalon-logkit-2.1-src.zip