diff --git a/wsdl4j.changes b/wsdl4j.changes
index 4c9d731..90cb66b 100644
--- a/wsdl4j.changes
+++ b/wsdl4j.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Jun 17 15:39:38 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner.
+
 -------------------------------------------------------------------
 Tue Jun 17 15:36:50 UTC 2014 - tchvatal@suse.com
 
diff --git a/wsdl4j.spec b/wsdl4j.spec
index c8bb79f..fad6a16 100644
--- a/wsdl4j.spec
+++ b/wsdl4j.spec
@@ -14,28 +14,27 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 Name:           wsdl4j
+Version:        1.6.3
+Release:        0
+Summary:        Web Services Description Language Toolkit for Java
+License:        IPL-1.0
+Group:          Development/Libraries/Java
+Url:            http://sourceforge.net/projects/wsdl4j
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.zip
+Source1:        %{name}-MANIFEST.MF
+Source2:        http://repo1.maven.org/maven2/wsdl4j/wsdl4j/%{version}/wsdl4j-%{version}.pom
 BuildRequires:  ant-junit
 BuildRequires:  java2-devel-packages
 BuildRequires:  unzip
 BuildRequires:  xml-commons-apis
 BuildRequires:  zip
-Summary:        Web Services Description Language Toolkit for Java
-License:        IPL-1.0
-Group:          Development/Libraries/Java
-Version:        1.6.3
-Release:        0
-Url:            http://sourceforge.net/projects/wsdl4j
-BuildArch:      noarch
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}-src-%{version}.zip
-Source1:        %{name}-MANIFEST.MF
-Source2:        http://repo1.maven.org/maven2/wsdl4j/wsdl4j/%{version}/wsdl4j-%{version}.pom
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       java
 Requires:       jaxp_parser_impl
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The Web Services Description Language for Java Toolkit (WSDL4J) allows
@@ -43,10 +42,7 @@ the creation, representation, and manipulation of WSDL documents
 describing services.  This codebase will eventually serve as a
 reference implementation of the standard created by JSR110.
 
-
-
 %package javadoc
-PreReq:         coreutils
 Summary:        Javadoc for wsdl4j
 Group:          Development/Libraries/Java
 
@@ -59,8 +55,6 @@ reference implementation of the standard created by JSR110.
 This package contains the javadoc documentation for the Web Services
 Description Language for Java.
 
-
-
 %prep
 %setup -q -n %{name}-1_6_3
 
@@ -75,18 +69,18 @@ touch META-INF/MANIFEST.MF
 zip -u build/lib/%{name}.jar META-INF/MANIFEST.MF
 
 # jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/lib/%{name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-install -m 644 build/lib/qname.jar $RPM_BUILD_ROOT%{_javadir}/qname.jar
+install -d -m 0755 %{buildroot}%{_javadir}
+install -m 644 build/lib/%{name}.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 build/lib/qname.jar %{buildroot}%{_javadir}/qname.jar
 
 # POMs
-install -d -m 0755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+install -d -m 0755 %{buildroot}%{_mavenpomdir}
+install -p -m 0644 %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 # javadoc
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-cp -pr build/javadocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+cp -pr build/javadocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
 
 install -d -m 755 %{buildroot}%{_javadir}/javax.wsdl/
 ln -sf ../%{name}.jar %{buildroot}%{_javadir}/javax.wsdl/