diff --git a/tycho.spec b/tycho.spec
index 25040e6..058456c 100644
--- a/tycho.spec
+++ b/tycho.spec
@@ -6,7 +6,7 @@
 # This basically uses javac + xmvn to build only the Tycho components
 # required to perform a full Tycho build
 # Most common usage : A library (in Fedora) used by Tycho's runtime broke API
-%global tycho_bootstrap 0
+%global tycho_bootstrap 1
 # Set 'eclipse_bootstrap' if Eclipse from buildroot cannot help build Tycho
 # This basically provides a location for usage of pre-bundled Eclipse
 # Possible uses : Need to build Tycho before Eclipse in fresh buildroot
@@ -23,7 +23,7 @@
 
 Name:           tycho
 Version:        0.22.0
-Release:        3%{?dist}
+Release:        2.1%{?dist}
 Summary:        Plugins and extensions for building Eclipse plugins and OSGI bundles with Maven
 
 Group:          Development/Libraries
@@ -62,6 +62,7 @@ Patch6:         %{name}-running-env-only.patch
 
 BuildArch:      noarch
 
+BuildRequires:  tycho
 BuildRequires:  java-devel
 BuildRequires:  maven-local >= 4.2.0
 BuildRequires:  maven-clean-plugin
@@ -409,9 +410,6 @@ ln -s %{_javadir}/tycho/org.fedoraproject.p2.jar %{buildroot}%{_datadir}/xmvn/li
 %{_javadocdir}/tycho
 
 %changelog
-* Thu Dec  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.22.0-3
-- Non-bootstrap build
-
 * Thu Dec  4 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.22.0-2.1
 - fedoraproject-p2: Add support for installation into SCLs
 - Bootstrap build