diff --git a/xmlunit.spec b/xmlunit.spec
index 04cc0cd..6e4e270 100644
--- a/xmlunit.spec
+++ b/xmlunit.spec
@@ -1,41 +1,31 @@
+#
+# spec file for package xmlunit (Version 1.0)
+#
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2000-2008, JPackage Project
 # All rights reserved.
 #
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name of the JPackage Project nor the names of its
-#    contributors may be used to endorse or promote products derived
-#    from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 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/
 #
 
+
 %define section free
 
 Name:           xmlunit
 Version:        1.0
-Release:        6%{?dist}
+Release:        1
 Summary:        Provides classes to do asserts on XML
 License:        BSD
-URL:            http://xmlunit.sourceforge.net/
+Url:            http://xmlunit.sourceforge.net/
 Source0:        http://download.sourceforge.net/xmlunit/xmlunit1.0.zip
 Source1:        http://repo1.maven.org/maven2/xmlunit/xmlunit/1.0/xmlunit-1.0.pom
 Patch0:         xmlunit-java5-enum.patch
@@ -57,7 +47,7 @@ Requires:       xml-commons-jaxp-1.3-apis
 Requires:       xerces-j2
 Group:          Development/Libraries/Java
 BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):    jpackage-utils >= 1.7.3
 Requires(postun):  jpackage-utils >= 1.7.3
 
@@ -68,6 +58,7 @@ documents against a DTD, and (from v0.5) compares the results of XPath
 expressions.
 
 %package javadoc
+License:        BSD
 Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
 
@@ -120,7 +111,6 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %post
 %update_maven_depmap
 
@@ -140,26 +130,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}
 
 %changelog
-* Tue Jul 29 2008 David Walluck <dwalluck@redhat.com> 0:1.0-6
-- patch for Java5
-- remove javadoc scriptlets
-- GCJ fixes
-- fix maven directory ownership
-
-* Tue Dec 18 2007 Ralph Apel <r.apel at r-apel.de> - 0:1.0-5jpp
-- Add poms and depmap frags
-- Make Vendor, Distribution based on macro
-- Add gcj_support option
-
-* Mon May 08 2006 Ralph Apel <r.apel at r-apel.de> - 0:1.0-4jpp
-- First JPP-1.7 release
-
-* Thu Aug 26 2004 Ralph Apel <r.apel at r-apel.de> - 0:1.0-3jpp
-- Build with ant-1.6.2
-
-* Wed Dec 17 2003 Paul Nasrat <pauln at truemesh.com> - 0:1.0-2jpp
-- Fix license and improved description
-- Thanks to Ralph Apel who produced a spec - merged version info
-
-* Wed Dec 17 2003 Paul Nasrat <pauln at truemesh.com> - 0:1.0-1jpp
-- Initial Version