diff --git a/wsdl4j-1.5.1-src.tar.gz b/wsdl4j-1.5.1-src.tar.gz
deleted file mode 100644
index 6df8464..0000000
--- a/wsdl4j-1.5.1-src.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a6d53069a6050f35df350f2008226bf551eae6a1b20978cd94004b152d2b26ae
-size 6014923
diff --git a/wsdl4j-1.6.3.pom b/wsdl4j-1.6.3.pom
new file mode 100644
index 0000000..e72fc4b
--- /dev/null
+++ b/wsdl4j-1.6.3.pom
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>wsdl4j</groupId>
+    <artifactId>wsdl4j</artifactId>
+    <version>1.6.3</version>
+    <packaging>jar</packaging>
+    <name>WSDL4J</name>
+    <url>http://sf.net/projects/wsdl4j</url>
+    <description>Java stub generator for WSDL</description>
+    <dependencies/>
+    <licenses>
+        <license>
+            <name>CPL</name>
+            <url>http://www.opensource.org/licenses/cpl1.0.txt</url>
+            <distribution>repo</distribution>
+            <comments>Common Public License</comments>
+        </license>
+    </licenses>
+    <scm>
+        <connection>scm:cvs:pserver:anonymous@wsdl4j.cvs.sourceforge.net:/cvsroot/wsdl4j</connection>
+        <developerConnection>scm:cvs:pserver:wsdl4j.cvs.sourceforge.net:/cvsroot/wsdl4j</developerConnection>
+        <url>http://wsdl4j.cvs.sourceforge.net/wsdl4j</url>
+    </scm>
+    <developers>
+        <developer>
+            <id>wsdl4j</id>
+            <name>WSDL4J</name>
+            <email>wsdl4j-discuss@sourceforge.net</email>
+        </developer>
+    </developers>
+</project>
diff --git a/wsdl4j-MANIFEST.MF b/wsdl4j-MANIFEST.MF
new file mode 100644
index 0000000..ce7ebef
--- /dev/null
+++ b/wsdl4j-MANIFEST.MF
@@ -0,0 +1,23 @@
+Manifest-Version: 1.0
+Bundle-SymbolicName: javax.wsdl
+Specification-Version: 1.2
+Bundle-ManifestVersion: 2
+Specification-Title: JWSDL
+Bundle-Version: 1.6.3
+Bundle-Vendor: IBM
+Implementation-Vendor: IBM
+Bundle-RequiredExecutionEnvironment: J2SE-1.2
+Bundle-Localization: plugin
+Bundle-Name: WSDL4J
+Specification-Vendor: IBM (Java Community Process)
+Implementation-Version: 1.6
+Bundle-ClassPath: .
+Implementation-Title: WSDL4J
+Export-Package: com.ibm.wsdl,com.ibm.wsdl.extensions,com.ibm.wsdl.exte
+ nsions.http,com.ibm.wsdl.extensions.mime,com.ibm.wsdl.extensions.sche
+ ma,com.ibm.wsdl.extensions.soap,com.ibm.wsdl.extensions.soap12,com.ib
+ m.wsdl.factory,com.ibm.wsdl.util,com.ibm.wsdl.util.xml,com.ibm.wsdl.x
+ ml,javax.wsdl,javax.wsdl.extensions,javax.wsdl.extensions.http,javax.
+ wsdl.extensions.mime,javax.wsdl.extensions.schema,javax.wsdl.extensio
+ ns.soap,javax.wsdl.extensions.soap12,javax.wsdl.factory,javax.wsdl.xm
+ l
diff --git a/wsdl4j-java14compat.patch b/wsdl4j-java14compat.patch
deleted file mode 100644
index 8c1c8b0..0000000
--- a/wsdl4j-java14compat.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur ../wsdl4j-1.5.1.orig/build.xml ./build.xml
---- ../wsdl4j-1.5.1.orig/build.xml	2005-04-12 16:10:33.000000000 +0200
-+++ ./build.xml	2006-09-22 15:35:08.000000000 +0200
-@@ -118,7 +118,8 @@
-   <!-- =================================================================== -->
-   <target name="compile" depends="prepare">
-     <mkdir dir="${build.dest}"/>
--    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}">
-+    <javac srcdir="${src.dir}" destdir="${build.dest}" debug="${debug}"
-+           target="1.4" source="1.4">
-       <patternset refid="javac.source.files"/>
-     </javac>
- 
diff --git a/wsdl4j-src-1.6.3.zip b/wsdl4j-src-1.6.3.zip
new file mode 100644
index 0000000..23d3f2a
--- /dev/null
+++ b/wsdl4j-src-1.6.3.zip
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d7da3332e105f835d3899f516859e0cdc4be7403883f3a5fb7c56f09d6e009e4
+size 173137
diff --git a/wsdl4j.changes b/wsdl4j.changes
index 6633730..9fab6f4 100644
--- a/wsdl4j.changes
+++ b/wsdl4j.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+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
+
+- Version bump to 1.6.3 to match upstream code.
+  * Package done to match fedora one.
+- Delete no longer needed patch:
+  * wsdl4j-java14compat.patch
+
 -------------------------------------------------------------------
 Fri Sep 13 08:19:51 UTC 2013 - mvyskocil@suse.com
 
diff --git a/wsdl4j.spec b/wsdl4j.spec
index 612e2ba..fad6a16 100644
--- a/wsdl4j.spec
+++ b/wsdl4j.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package wsdl4j
 #
-# Copyright (c) 2013 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
@@ -14,34 +14,27 @@
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
-# icecream 0
 
 
 Name:           wsdl4j
-BuildRequires:  ant-junit
-BuildRequires:  java2-devel-packages
-BuildRequires:  xml-commons-apis
-%define name            wsdl4j
-%define version         1.5.1
-%define release         1jpp
-%define section         free
-# -----------------------------------------------------------------------------
+Version:        1.6.3
+Release:        0
 Summary:        Web Services Description Language Toolkit for Java
 License:        IPL-1.0
 Group:          Development/Libraries/Java
-Version:        1.5.1
-Release:        0
-Url:            http://www-124.ibm.com/developerworks/projects/wsdl4j/
-BuildArch:      noarch
-Source0:        wsdl4j-%{version}-src.tar.gz
-##cvs -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/wsdl4j login
-##cvs -z3 -d:pserver:anonymous@cvs.sourceforge.net:/cvsroot/wsdl4j export -r wsdl4j-1_5_1 wsdl4j
-Patch:          %{name}-java14compat.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+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
 Requires:       java
 Requires:       jaxp_parser_impl
-#XXX: temporary fix to make axis auto dependencies work, need to revork package
-Provides:       osgi(javax.wsdl)
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildArch:      noarch
 
 %description
 The Web Services Description Language for Java Toolkit (WSDL4J) allows
@@ -49,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
 
@@ -65,48 +55,42 @@ 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}-%{version}
-%patch
+%setup -q -n %{name}-1_6_3
 
 %build
-export OPT_JAR_LIST="ant/ant-junit junit"
-[ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-#ant -Dbuild.compiler=modern compile
-#ant -Dbuild.compiler=modern javadocs
-ant -Dbuild.compiler=modern compile test javadocs
+ant compile javadocs
 
 %install
+# inject OSGi manifests
+mkdir -p META-INF
+cp -p %{SOURCE1} META-INF/MANIFEST.MF
+touch META-INF/MANIFEST.MF
+zip -u build/lib/%{name}.jar META-INF/MANIFEST.MF
+
 # jars
-install -d -m 0755 $RPM_BUILD_ROOT%{_javadir}
-for jar in %{name}.jar qname.jar ; do
-   vjar=$(echo $jar | sed s+.jar+-%{version}.jar+g)
-   install -m 644 build/lib/$jar $RPM_BUILD_ROOT%{_javadir}/$vjar
-   pushd $RPM_BUILD_ROOT%{_javadir}
-      ln -fs $vjar $jar
-   popd
-done
+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 %{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}/
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%post javadoc
-rm -f %{_javadocdir}/%{name}
-ln -s %{name}-%{version} %{_javadocdir}/%{name}
-
-%postun javadoc
-if [ "$1" = "0" ]; then
-    rm -f %{_javadocdir}/%{name}
-fi
+install -d -m 755 %{buildroot}%{_javadir}/javax.wsdl/
+ln -sf ../%{name}.jar %{buildroot}%{_javadir}/javax.wsdl/
+ln -sf ../qname.jar %{buildroot}%{_javadir}/javax.wsdl/
 
 %files
 %defattr(0644,root,root,0755)
 %doc license.html
+%{_mavenpomdir}/JPP-%{name}.pom
+%config %{_mavendepmapfragdir}/*
 %{_javadir}/*
 
 %files javadoc