diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 2c71861..0442da4 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Sat Apr  6 07:15:46 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Rename gradle-local and ivy-local to javapackages-gradle and
+  javapackages-ivy and let them depend only on javapackages-tools
+  and javapackages-local. These packages only install files
+  produced during the javapackages-tools build. The dependencies
+  will be pulled by gradle-local, ivy-local and maven-local
+  meta-packages built in a separate spec file.
+
 -------------------------------------------------------------------
 Thu Apr  4 08:01:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 576e85b..ac7804b 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -75,28 +75,26 @@ This package provides some basic directories into which Java packages
 install their content.
 
 %if %{with python}
-%package -n gradle-local
-Summary:        Local mode for Gradle
+%package -n javapackages-gradle
+Summary:        Local mode for Gradle (files)
 Group:          Development/Languages/Java
 Requires:       javapackages-local = %{version}
 Requires:       javapackages-tools = %{version}
 
-%description -n gradle-local
-This package implements local mode for Gradle, which allows artifact
-resolution using XMvn resolver.
+%description -n javapackages-gradle
+This package contains files needed by local mode for Gradle, which
+allows artifact resolution using XMvn resolver.
 
-%package -n ivy-local
-Summary:        Local mode for Apache Ivy
+
+%package -n javapackages-ivy
+Summary:        Local mode for Apache Ivy (files)
 Group:          Development/Languages/Java
-Requires:       ant
-Requires:       apache-ivy >= 2.3.0
 Requires:       javapackages-local = %{version}
 Requires:       javapackages-tools = %{version}
-Requires:       xmvn-connector-ivy
 
-%description -n ivy-local
-This package implements local mode fow Apache Ivy, which allows
-artifact resolution using XMvn resolver.
+%description -n javapackages-ivy
+This package contains files needed by local mode fow Apache Ivy, which
+allows artifact resolution using XMvn resolver.
 
 %package -n python3-javapackages
 Summary:        Module for handling various files for Java packaging
@@ -202,10 +200,10 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
 %files -n javapackages-local -f files-local
 %dir %{_datadir}/java-utils
 
-%files -n gradle-local -f files-gradle
+%files -n javapackages-gradle -f files-gradle
 %dir %{_datadir}/gradle-local
 
-%files -n ivy-local -f files-ivy
+%files -n javapackages-ivy -f files-ivy
 %dir %{_sysconfdir}/ant.d
 
 %files -n python3-javapackages