diff --git a/jakarta-activation.spec b/jakarta-activation.spec
index 53b0f6b..28b4c97 100644
--- a/jakarta-activation.spec
+++ b/jakarta-activation.spec
@@ -1,25 +1,19 @@
-%global srcname jaf
-
 Name:           jakarta-activation
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Jakarta Activation Specification and Implementation
 License:        BSD
-
 URL:            https://eclipse-ee4j.github.io/jaf/
-Source0:        https://github.com/eclipse-ee4j/jaf/archive/%{version}/%{srcname}-%{version}.tar.gz
-
 BuildArch:      noarch
 
+Source0:        https://github.com/eclipse-ee4j/jaf/archive/%{version}/jaf-%{version}.tar.gz
+
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-enforcer-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
-
-Provides:       jaf = %{version}-%{release}
-Obsoletes:      jaf < 1.2.1-5
+BuildRequires:  mvn(org.codehaus.mojo:build-helper-maven-plugin)
 
 %description
 Jakarta Activation lets you take advantage of standard services to:
@@ -27,53 +21,49 @@ determine the type of an arbitrary piece of data; encapsulate access to
 it; discover the operations available on it; and instantiate the
 appropriate bean to perform the operation(s).
 
-
 %package javadoc
 Summary:        Javadoc for %{name}
 
 %description javadoc
 This package contains javadoc for %{name}.
 
-
 %prep
-%setup -q -n %{srcname}-%{version}
+%setup -q -n jaf-%{version}
 
-# remove unnecessary dependency on "org.eclipse.ee4j:project" (not packaged)
 %pom_remove_parent
+%pom_disable_module demo
 
-# remove unnecessary maven plugins
-%pom_remove_plugin :build-helper-maven-plugin
 %pom_remove_plugin :directory-maven-plugin
-%pom_remove_plugin :osgiversion-maven-plugin
+sed -i 's/${main.basedir}/${basedir}/' pom.xml
 
 # remove custom doclet configuration
 %pom_remove_plugin :maven-javadoc-plugin activation
 
-# disable demo submodule
-%pom_disable_module demo
-
 # set bundle version manually instead of with osgiversion-maven-plugin
 # (the plugin is only used to strip off -SNAPSHOT or -Mx qualifiers)
+%pom_remove_plugin :osgiversion-maven-plugin
 sed -i "s/\${activation.osgiversion}/%{version}/g" activation/pom.xml
 
-
 %build
-%mvn_build
-
+# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58
+%mvn_build -j
 
 %install
 %mvn_install
 
-
 %files -f .mfiles
-%license LICENSE.md NOTICE.md
 %doc README.md
-
-%files javadoc -f .mfiles-javadoc
 %license LICENSE.md NOTICE.md
 
+# javadoc temporairly disabled due to https://github.com/fedora-java/xmvn/issues/58
+#%files javadoc -f .mfiles-javadoc
+%files javadoc
+%license LICENSE.md NOTICE.md
 
 %changelog
+* Mon Jun 28 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.2.2-3
+- Temporarily disable javadoc generation
+
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild