diff --git a/jython.spec b/jython.spec
index 6f8b899..a0a4821 100644
--- a/jython.spec
+++ b/jython.spec
@@ -1,15 +1,23 @@
 #
 # spec file for package jython (Version 2.2)
 #
-# 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:           jython
 BuildRequires:  ant ht2html java2-devel-packages libreadline-java mysql-connector-java oro pyxml servletapi5
 %{expand: %%define pyver %(python -c 'import sys;print(sys.version[0:3])')}
@@ -21,18 +29,18 @@ BuildRequires:  ant ht2html java2-devel-packages libreadline-java mysql-connecto
 %define release		0.a0.2jpp
 %define section		free
 Version:        2.2
-Release:        24
+Release:        315
 Summary:        Java Source Interpreter
-License:        Other uncritical OpenSource License
-URL:            http://www.jython.org/
+License:        Apache Software License
+Url:            http://www.jython.org/
 Source0:        %{name}-cvs.tar.bz2
 Source1:        python-release22-maint-cvs.tar.bz2
 Patch0:         %{name}-cachedir.patch
-Requires:       jpackage-utils >= 0:1.5
+Requires:       jpackage-utils >= 1.5
 Requires:       oro
 Requires:       servlet
 Group:          Development/Libraries/Java
-Buildarch:	noarch
+BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -57,6 +65,7 @@ development and in shipping products.
 
 
 %package manual
+License:        Other uncritical OpenSource License; Apache Software License
 Summary:        Manual for jython
 Group:          Development/Libraries/Java
 
@@ -84,6 +93,7 @@ development and in shipping products.
 
 
 %package javadoc
+License:        Other uncritical OpenSource License; Apache Software License
 PreReq:         coreutils
 Summary:        Javadoc for jython
 Group:          Development/Libraries/Java
@@ -112,6 +122,7 @@ development and in shipping products.
 
 
 %package demo
+License:        Other uncritical OpenSource License; Apache Software License
 Summary:        Demonstration and samples for jython
 Requires:       %{name} = %{version}-%{release}
 Group:          Development/Libraries/Java
@@ -259,18 +270,18 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_datadir}/%{name}/Demo
 
-%changelog -n jython
-* Sun Sep 17 2006 - ro@suse.de
+%changelog
+* Sun Sep 17 2006 ro@suse.de
 - set source=1.4 for java
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Sun Sep 11 2005 - ro@suse.de
+* Sun Sep 11 2005 ro@suse.de
 - remove epoch leftover
-* Thu Jul 28 2005 - jsmeix@suse.de
+* Thu Jul 28 2005 jsmeix@suse.de
 - Adjustments in the spec file.
-* Mon Jul 25 2005 - jsmeix@suse.de
+* Mon Jul 25 2005 jsmeix@suse.de
 - Current version 2.2 from JPackage.org
-* Wed Sep 08 2004 - ro@suse.de
+* Wed Sep 08 2004 ro@suse.de
 - fix lib64 issue
-* Thu Sep 02 2004 - skh@suse.de
+* Thu Sep 02 2004 skh@suse.de
 - Initial package created with version 2.2 (JPackage 1.5)