diff --git a/swing-worker.changes b/swing-worker.changes
index 5f53da8..353caaf 100644
--- a/swing-worker.changes
+++ b/swing-worker.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Jul 11 14:10:03 UTC 2014 - tchvatal@suse.com
+
+- Cleanup with spec-cleaner and do not version javadoc dir.
+
 -------------------------------------------------------------------
 Mon Sep 15 14:12:59 CEST 2008 - mvyskocil@suse.cz
 
diff --git a/swing-worker.spec b/swing-worker.spec
index 3a5269b..b8184f6 100644
--- a/swing-worker.spec
+++ b/swing-worker.spec
@@ -1,7 +1,7 @@
 #
-# spec file for package swing-worker (Version 1.2)
+# spec file for package swing-worker
 #
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -15,23 +15,21 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-# norootforbuild
-
 
 Name:           swing-worker
 Version:        1.2
-Release:        3
+Release:        0
 Summary:        UI updates support for long running tasks
-Group:          Development/Libraries/Java
 License:        LGPL-2.1+
+Group:          Development/Libraries/Java
 Url:            https://swingworker.dev.java.net/
 Source0:        %{name}-src-%{version}.tar.bz2
 Source1:        releasenotes.txt
+BuildRequires:  ant
+BuildRequires:  java-devel
+Requires:       jre >= 1.5
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
-BuildRequires:  java-devel
-BuildRequires:  ant
-Requires:       jre >= 1.5
 
 %description
 SwingWorker is designed for situations where you need to have a long
@@ -39,12 +37,9 @@ running task run in a background thread and provide updates to the UI
 either when done, or while processing. This project is a backport of
 SwingWorker included into Java 1.6.
 
-
-
 %package javadoc
-License:        LGPL-2.1+
-Group:          Development/Libraries/Java
 Summary:        UI updates support for long running tasks
+Group:          Development/Libraries/Java
 
 %description		javadoc
 SwingWorker is designed for situations where you need to have a long
@@ -52,12 +47,9 @@ running task run in a background thread and provide updates to the UI
 either when done, or while processing. This project is a backport of
 SwingWorker included into Java 1.6.
 
-
-
 %package demo
-License:        LGPL-2.1+
-Group:          Development/Libraries/Java
 Summary:        UI updates support for long running tasks
+Group:          Development/Libraries/Java
 Requires:       %{name} = %{version}-%{release}
 
 %description 		demo
@@ -66,8 +58,6 @@ running task run in a background thread and provide updates to the UI
 either when done, or while processing. This project is a backport of
 SwingWorker included into Java 1.6.
 
-
-
 %prep
 %setup -q -c %{name}-%{version}
 # remove all third party jars
@@ -77,24 +67,21 @@ cp %{SOURCE1} .
 sed -i -e 's/.$//' releasenotes.txt COPYING
 
 %build
-ant -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
+ant \
+    -Dant.build.javac.source=1.5 -Dant.build.javac.target=1.5 \
     bundles
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT/%{_javadir}
+install -d -m 755 %{buildroot}/%{_javadir}
 # jars
-install -pm 644 dist/bundles/%{name}.jar $RPM_BUILD_ROOT/%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir}/ && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
+install -pm 644 dist/bundles/%{name}.jar %{buildroot}/%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir}/ && for jar in *-%{version}*; do ln -sf ${jar} ${jar/-%{version}/}; done)
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
-cp -pr dist/javadoc/* $RPM_BUILD_ROOT/%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT/%{_javadocdir}/%{name}
+install -d -m 755 %{buildroot}/%{_javadocdir}/%{name}
+cp -pr dist/javadoc/* %{buildroot}/%{_javadocdir}/%{name}
 # demo
-install -d $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}
-cp -pr src/demo  $RPM_BUILD_ROOT/%{_datadir}/%{name}-%{version}/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d %{buildroot}/%{_datadir}/%{name}
+cp -pr src/demo  %{buildroot}/%{_datadir}/%{name}
 
 %files
 %defattr(0644,root,root,0755)
@@ -103,15 +90,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %files javadoc
 %defattr(0644,root,root,0755)
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %files demo
 %defattr(0644,root,root,0755)
-%{_datadir}/%{name}-%{version}
+%{_datadir}/%{name}
 
 %changelog
-* Mon Sep 15 2008 mvyskocil@suse.cz
-- -target=1.5 -source=1.5
-* Thu Aug 21 2008 mvyskocil@suse.cz
-- Initial packaging (version 1.2)