diff --git a/apache-commons-cli.changes b/apache-commons-cli.changes
index d62fd26..eb99ea9 100644
--- a/apache-commons-cli.changes
+++ b/apache-commons-cli.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 12 12:54:07 UTC 2021 - Fridrich Strba <fstrba@suse.com>
+
+- Add OSGi manifest to the build files.
+- Set java source/target levels to 6
+
 -------------------------------------------------------------------
 Mon Mar 25 17:19:16 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-cli.spec b/apache-commons-cli.spec
index 0b25b15..e5004cf 100644
--- a/apache-commons-cli.spec
+++ b/apache-commons-cli.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-cli
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,13 +30,11 @@ Source1:        build.xml.tar.bz2
 Patch0:         CLI-253-workaround.patch
 BuildRequires:  ant
 BuildRequires:  fdupes
-BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
-Requires:       java >= 1.8
 Provides:       jakarta-%{short_name} = %{version}-%{release}
-Obsoletes:      jakarta-%{short_name} < %{version}
-Provides:       apache-cli = %{version}
-Obsoletes:      apache-cli < %{version}
+Obsoletes:      jakarta-%{short_name} < %{version}-%{release}
+Provides:       apache-cli = %{version}-%{release}
+Obsoletes:      apache-cli < %{version}-%{release}
 BuildArch:      noarch
 
 %description
@@ -46,8 +44,8 @@ command line arguments and options.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation/HTML
-Provides:       jakarta-%{short_name}-javadoc = %{version}
-Obsoletes:      jakarta-%{short_name}-javadoc < %{version}
+Provides:       jakarta-%{short_name}-javadoc = %{version}-%{release}
+Obsoletes:      jakarta-%{short_name}-javadoc < %{version}-%{release}
 
 %description javadoc
 This package contains the API documentation for %{name}.
diff --git a/build.xml.tar.bz2 b/build.xml.tar.bz2
index 34840d8..d092964 100644
--- a/build.xml.tar.bz2
+++ b/build.xml.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7d2cd321bc2a81e5bd7668a3bb07b5b3b62cdc513dfac7be8b9b290817d64b25
-size 3094
+oid sha256:a4e4b0af7f48d4f5e30fd3c65775ba937ef69993c0ccb37e727492d237517428
+size 3472