diff --git a/commons-modeler-2.0-src.tar.bz2 b/commons-modeler-2.0-src.tar.bz2
new file mode 100644
index 0000000..4fcdad5
--- /dev/null
+++ b/commons-modeler-2.0-src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:56357eaf38757babebd11f38a4697fc459ab0a651ae0945a4a358473803a310b
+size 96119
diff --git a/jakarta-commons-modeler-java14compat.patch b/jakarta-commons-modeler-java14compat.patch
index 977e2cd..ca975be 100644
--- a/jakarta-commons-modeler-java14compat.patch
+++ b/jakarta-commons-modeler-java14compat.patch
@@ -1,25 +1,22 @@
-diff -Naur ../commons-modeler-1.1-src.orig/build.xml ./build.xml
---- ../commons-modeler-1.1-src.orig/build.xml	2003-07-29 02:50:44.000000000 +0200
-+++ ./build.xml	2006-09-25 13:35:59.000000000 +0200
-@@ -157,7 +157,9 @@
-            destdir="${build.home}/classes"
-              debug="${compile.debug}"
-        deprecation="${compile.deprecation}"
--          optimize="${compile.optimize}">
-+          optimize="${compile.optimize}"
-+	    source="1.4"
-+	    target="1.4">
-       <classpath refid="compile.classpath"/>
-       <exclude name="org/apache/commons/modeler/ant/*PropertyHelper.java" unless="ant16.available" />
-       <exclude name="org/apache/commons/modeler/modules/MbeansDescriptorsDigesterSource.java" unless="digester.available" />
-@@ -279,7 +281,9 @@
-            destdir="${build.home}/tests"
-              debug="${compile.debug}"
-        deprecation="${compile.deprecation}"
--          optimize="${compile.optimize}">
-+          optimize="${compile.optimize}"
-+	    source="1.4"
-+	    target="1.4">
-       <classpath refid="test.classpath"/>
-     </javac>
-     <copy    todir="${build.home}/tests" filtering="on">
+Index: commons-modeler-2.0-src/build.xml
+===================================================================
+--- commons-modeler-2.0-src.orig/build.xml
++++ commons-modeler-2.0-src/build.xml
+@@ -156,6 +156,8 @@
+     <javac  srcdir="${source.home}"
+            destdir="${build.home}/classes"
+              debug="${compile.debug}"
++            source="1.4"
++            target="1.4"
+        deprecation="${compile.deprecation}"
+           optimize="${compile.optimize}">
+       <classpath refid="compile.classpath"/>
+@@ -276,6 +278,8 @@
+   <target name="compile.tests" depends="compile"
+    description="Compile unit test cases">
+     <javac  srcdir="${test.home}"
++     source="1.4"
++     target="1.4"
+            destdir="${build.home}/tests"
+              debug="${compile.debug}"
+        deprecation="${compile.deprecation}"
diff --git a/jakarta-commons-modeler.changes b/jakarta-commons-modeler.changes
index 3bee0cf..898ae93 100644
--- a/jakarta-commons-modeler.changes
+++ b/jakarta-commons-modeler.changes
@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Mon Mar 19 15:16:07 CET 2007 - dbornkessel@suse.de
+
+- update to version 2.0 ... needed for newest tomcat55
+  BUG REPORTS ADDRESSED:
+  o MODELER-18   support for general descriptors
+  o MODELER-17   [modeler] MbeansSource don't use args at mbeans and operations
+  o MODELER-16   [modeler] download links broken  
+  o MODELER-15   [modeler] IntrospectionUtils memory leak  
+  o MODELER-14   After setting an Attribute the Notification Listener will not performed  
+  o MODELER-13   [modeler] BaseModelMBean class setModeledType method should be setModelerType  
+  o MODELER-12   [modeler] ManagedBean uses the wrong case for ObjectReference  
+  o MODELER-11   [modeler] Null Pointer Exception - Non-Singleton Registry  
+  o MODELER-10   [modeler] DTD violation when using simple wrapping  
+  o MODELER-9    [modeler] Registry.convertValue doesn't support longs  
+  o MODELER-8    [modeler] AttributeChangeNotification sent before attribute changes  
+  o MODELER-7    sendAttributeChangeNotification on setAttribute  
+  o MODELER-6    [modeler] wiki page is immutable and out-of-date  
+  o MODELER-5    [modeler] setServer stack overflow  
+  o MODELER-4    [modeler] Overloaded operations throw "wrong number of parameters" exception  
+  o MODELER-3    [modeler] maven build fails on os x with test failure.  
+  o MODELER-2    [modeler] Registry insufficiently synchronized  
+  o MODELER-1    ClassNotFoundException while using the Notification  
+
 -------------------------------------------------------------------
 Mon Sep 25 13:39:47 CEST 2006 - skh@suse.de
 
diff --git a/jakarta-commons-modeler.spec b/jakarta-commons-modeler.spec
index 043617e..c7ebd53 100644
--- a/jakarta-commons-modeler.spec
+++ b/jakarta-commons-modeler.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package jakarta-commons-modeler (Version 1.1)
+# spec file for package jakarta-commons-modeler (Version 2.0)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -16,15 +16,15 @@ BuildRequires:  ant jakarta-commons-digester java2-devel-packages jmx junit xala
 %define base_name	modeler
 %define short_name	commons-%{base_name}
 %define name		jakarta-%{short_name}
-%define version		1.1
+%define version		2.0
 %define release		4jpp
 %define	section		free
-Version:        1.1
-Release:        25
+Version:        2.0
+Release:        1
 Summary:        Jakarta Commons Modeler Package
-License:        Apache
+License:        The Apache Software License
 Group:          Development/Libraries/Java
-Source0:        %{base_name}-%{version}-src.tar.gz
+Source0:        %{short_name}-%{version}-src.tar.bz2
 #Patch:		%{name}.no-licence.build.patch
 Patch:          %{name}-java14compat.patch
 URL:            http://jakarta.apache.org/commons/modeler/
@@ -67,8 +67,7 @@ Modeler Package.
 
 %prep
 %setup -n %{short_name}-%{version}-src
-%patch
-#%%patch
+%patch -p1
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
 
@@ -108,7 +107,7 @@ fi
 
 %files
 %defattr(0644,root,root,0755)
-%doc STATUS.html RELEASE-NOTES.txt PROPOSAL.html
+%doc LICENSE.txt NOTICE.txt  RELEASE-NOTES.txt xdocs
 %{_javadir}/*
 
 %files javadoc
@@ -117,7 +116,28 @@ fi
 %{_javadocdir}/%{name}-%{version}/*
 %ghost %dir %{_javadocdir}/%{name}
 
-%changelog -n jakarta-commons-modeler
+%changelog
+* Mon Mar 19 2007 - dbornkessel@suse.de
+- update to version 2.0 ... needed for newest tomcat55
+  BUG REPORTS ADDRESSED:
+  o MODELER-18   support for general descriptors
+  o MODELER-17   [modeler] MbeansSource don't use args at mbeans and operations
+  o MODELER-16   [modeler] download links broken
+  o MODELER-15   [modeler] IntrospectionUtils memory leak
+  o MODELER-14   After setting an Attribute the Notification Listener will not performed
+  o MODELER-13   [modeler] BaseModelMBean class setModeledType method should be setModelerType
+  o MODELER-12   [modeler] ManagedBean uses the wrong case for ObjectReference
+  o MODELER-11   [modeler] Null Pointer Exception - Non-Singleton Registry
+  o MODELER-10   [modeler] DTD violation when using simple wrapping
+  o MODELER-9    [modeler] Registry.convertValue doesn't support longs
+  o MODELER-8    [modeler] AttributeChangeNotification sent before attribute changes
+  o MODELER-7    sendAttributeChangeNotification on setAttribute
+  o MODELER-6    [modeler] wiki page is immutable and out-of-date
+  o MODELER-5    [modeler] setServer stack overflow
+  o MODELER-4    [modeler] Overloaded operations throw "wrong number of parameters" exception
+  o MODELER-3    [modeler] maven build fails on os x with test failure.
+  o MODELER-2    [modeler] Registry insufficiently synchronized
+  o MODELER-1    ClassNotFoundException while using the Notification
 * Mon Sep 25 2006 - skh@suse.de
 - don't use icecream
 - use source="1.4" and target="1.4" for build with java 1.5
diff --git a/modeler-1.1-src.tar.gz b/modeler-1.1-src.tar.gz
deleted file mode 100644
index d51a738..0000000
--- a/modeler-1.1-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:41146b9e3614eda22064fbdde457750608b0cbc0ff2d904a39c5938b165fc2e7
-size 92211