diff --git a/servletapi4.spec b/servletapi4.spec
index fe7938e..8fe9376 100644
--- a/servletapi4.spec
+++ b/servletapi4.spec
@@ -1,15 +1,23 @@
 #
 # spec file for package servletapi4 (Version 4.0.4)
 #
-# Copyright (c) 2006 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.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
+
 Name:           servletapi4
 BuildRequires:  ant java2-devel-packages xml-commons-apis
 %define	base_name	servletapi
@@ -20,18 +28,18 @@ BuildRequires:  ant java2-devel-packages xml-commons-apis
 %define release		3jpp
 %define section		free
 Version:        4.0.4
-Release:        24
+Release:        272
 Summary:        Java servlet and JSP implementation classes
-License:        Apache
+License:        The Apache Software License
 Group:          Development/Libraries/Java
 Source:         %{full_name}-4-src.tar.gz
 Patch150:       java150_build.patch
-URL:            http://jakarta.apache.org/tomcat/
+Url:            http://jakarta.apache.org/tomcat/
 Provides:       servlet
 PreReq:         /usr/sbin/update-alternatives
-Buildrequires:	ant >= 1.2
-Buildrequires:  jpackage-utils > 1.4
-BuildArch:	noarch
+BuildRequires:  ant >= 1.2
+BuildRequires:  jpackage-utils > 1.4
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Obsoletes:      servlet4
 Obsoletes:      servlet23
@@ -45,6 +53,7 @@ of the Java Servlet and JSP APIs (packages javax.servlet).
 
 
 %package javadoc
+License:        The Apache Software License
 Group:          Development/Libraries/Java
 Summary:        Javadoc for servletapi4
 PreReq:         coreutils
@@ -93,16 +102,16 @@ fi
 %defattr(-,root,root)
 %{_javadocdir}/%{name}
 
-%changelog -n servletapi4
-* Mon Sep 25 2006 - dbornkessel@suse.de
+%changelog
+* Mon Sep 25 2006 dbornkessel@suse.de
 - fixes necessary to compile with Java 1.5.0
-- set source="1.4" and target="1.4" for ant "javac" tasks
-- set source="1.4" for ant "javadoc" tasks
-* Wed Jan 25 2006 - mls@suse.de
+        - set source="1.4" and target="1.4" for ant "javac" tasks
+        - set source="1.4" for ant "javadoc" tasks
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Thu Sep 29 2005 - dmueller@suse.de
+* Thu Sep 29 2005 dmueller@suse.de
 - add norootforbuild
-* Thu Sep 16 2004 - skh@suse.de
+* Thu Sep 16 2004 skh@suse.de
 - Fix prerequires
-* Thu Sep 02 2004 - skh@suse.de
+* Thu Sep 02 2004 skh@suse.de
 - Initial package created with version 4.0.4 (JPackage 1.5)