diff --git a/antlr3.spec b/antlr3.spec
index 2878511..1904513 100644
--- a/antlr3.spec
+++ b/antlr3.spec
@@ -32,15 +32,14 @@
 %endif
 Version:        %{antlr_version}
 Release:        0
-Summary:        ANother Tool for Language Recognition
 License:        BSD-3-Clause
 Group:          Development/Libraries/Java
 URL:            https://www.antlr3.org/
 Source0:        https://github.com/antlr/antlr3/archive/%{antlr_version}.tar.gz
 Patch0:         0001-java8-fix.patch
-Patch100:       antlr3-generated_sources.patch
 # Generate OSGi metadata
 Patch1:         osgi-manifest.patch
+Patch100:       antlr3-generated_sources.patch
 BuildRequires:  fdupes
 BuildRequires:  maven-local
 BuildRequires:  mvn(antlr:antlr)
@@ -48,15 +47,17 @@ BuildRequires:  mvn(org.antlr:stringtemplate)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 BuildRequires:  unzip
+BuildArch:      noarch
 %if %{with runtime}
 Name:           antlr3-java
-BuildArch:      noarch
+Summary:        Java run-time support for ANTLR-generated parsers
 
 %description
 Java run-time support for ANTLR-generated parsers
 
 %else
 
+Summary:        ANother Tool for Language Recognition
 BuildRequires:  mvn(org.antlr:ST4)
 BuildRequires:  mvn(org.antlr:antlr-runtime)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-plugin-plugin)
@@ -92,7 +93,11 @@ Group:          Development/Libraries/Java
 Requires:       mvn(org.antlr:antlr-runtime) = %{antlr_version}
 # Explicit requires for javapackages-tools since antlr3-script
 # uses /usr/share/java-utils/java-functions
-BuildArch:      noarch
+Requires:       javapackages-tools
+%if %{without bootstrap}
+Provides:       antlr3-bootstrap-tool
+Conflicts:      antlr3-bootstrap-tool
+%endif
 
 %description tool
 ANother Tool for Language Recognition, is a language tool
@@ -219,14 +224,12 @@ EOF
 %endif
 
 %else
-
 %files -f .mfiles
 %license tool/LICENSE.txt
 
 %endif
 
 %if %{without bootstrap}
-
 %files javadoc -f .mfiles-javadoc
 %license tool/LICENSE.txt