diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 2ad3b4b..aeae864 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -92,6 +92,16 @@ Requires:       mvn(org.apache.maven.plugins:maven-surefire-plugin)
 %description -n maven-local
 This package provides macros and scripts to support packaging Maven artifacts.
 
+%package -n gradle-local
+Summary:        Local mode for Gradle
+Requires:       %{name} = %{version}-%{release}
+Requires:       javapackages-local = %{version}-%{release}
+Requires:       gradle >= 2.2.1-2
+Requires:       xmvn-connector-gradle
+
+%description -n gradle-local
+This package implements local mode for Gradle, which allows artifact
+resolution using XMvn resolver.
 
 %package -n ivy-local
 Summary:        Local mode for Apache Ivy
@@ -176,10 +186,6 @@ mkdir -p %{buildroot}%{_datadir}/xmvn/config.d/
 sed s/@{mns}/maven-3.6/g %{SOURCE1} >%{buildroot}%{_datadir}/xmvn/config.d/module-maven-3.6.xml
 %endif
 
-rm -rf %{buildroot}%{_bindir}/gradle-local
-rm -rf %{buildroot}%{_datadir}/gradle-local
-rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7
-
 mkdir -p %{buildroot}%{_datadir}/xmvn/conf/
 cp -p %{SOURCE2} %{buildroot}%{_datadir}/xmvn/conf/toolchains.xml
 
@@ -200,6 +206,8 @@ install -p -m 644 %{SOURCE3} %{buildroot}%{_sysconfdir}/java/javapackages-config
 
 %files -n maven-local
 
+%files -n gradle-local -f files-gradle
+
 %files -n ivy-local -f files-ivy
 
 %files -n javapackages-config-maven-3.6