diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 25594b3..2c71861 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Thu Apr  4 08:01:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Split maven-local meta-package out of javapackages-tools spec
+  file
+
+-------------------------------------------------------------------
+Wed Apr  3 09:42:32 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Make the ivy-local and maven-local sub-packages depend on the
+  right stuff, so that they actually can be used for building
+
 -------------------------------------------------------------------
 Mon Mar  4 17:34:49 UTC 2019 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index e7528cd..576e85b 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -75,15 +75,6 @@ This package provides some basic directories into which Java packages
 install their content.
 
 %if %{with python}
-%package -n maven-local
-Summary:        Macros and scripts for Maven packaging support
-Group:          Development/Languages/Java
-Requires:       javapackages-local = %{version}
-Requires:       javapackages-tools = %{version}
-
-%description -n maven-local
-This package provides macros and scripts to support packaging Maven artifacts.
-
 %package -n gradle-local
 Summary:        Local mode for Gradle
 Group:          Development/Languages/Java
@@ -98,8 +89,10 @@ resolution using XMvn resolver.
 Summary:        Local mode for Apache Ivy
 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
@@ -110,7 +103,8 @@ Summary:        Module for handling various files for Java packaging
 Group:          Development/Languages/Java
 Requires:       python3-lxml
 Requires:       python3-six
-Obsoletes:      python-javapackages
+Obsoletes:      python-javapackages < %{version}-%{release}
+Provides:       python-javapackages = %{version}-%{release}
 
 %description -n python3-javapackages
 Module for handling, querying and manipulating of various files for Java
@@ -208,8 +202,6 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
 %files -n javapackages-local -f files-local
 %dir %{_datadir}/java-utils
 
-%files -n maven-local -f files-maven
-
 %files -n gradle-local -f files-gradle
 %dir %{_datadir}/gradle-local