diff --git a/erlang-rebar.spec b/erlang-rebar.spec
index 3d07b70..c3b6f9d 100644
--- a/erlang-rebar.spec
+++ b/erlang-rebar.spec
@@ -5,7 +5,7 @@
 # Set this to true when starting a rebuild of the whole erlang stack. There's
 # a cyclical dependency between erlang-rebar and erlang-getopt so this package
 # (rebar) needs to get built first in bootstrap mode.
-%global need_bootstrap_set 1
+%global need_bootstrap_set 0
 
 %{!?need_bootstrap: %global need_bootstrap  %{need_bootstrap_set}}
 
@@ -97,9 +97,9 @@ Erlang Build Tools.
 %setup -q -n %{realname}-%{version}
 %patch1 -p1 -b .dont_load_templates
 %patch2 -p1 -b .remove_bundled_mustache
-#%if 0%{?need_bootstrap} < 1
+%if 0%{?need_bootstrap} < 1
 %patch3 -p1 -b .remove_bundled_getopt
-#%endif
+%endif
 %patch4 -p1 -b .allow_discarding_ports
 %patch5 -p1 -b .use_locally_installed
 %patch6 -p1 -b .remove_escript_foldl_3
@@ -141,8 +141,8 @@ cp -a priv %{buildroot}%{_erllibdir}/%{realname}-%{version}/
 
 
 %changelog
-* Wed Mar  2 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.1-5.1
-- Disable gbp properly (have to bootstrap)
+* Wed Mar  2 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.1-6
+- Disable gbp properly
 
 * Wed Mar  2 2016 Peter Lemenkov <lemenkov@gmail.com> - 2.6.1-5
 - Fix dependency issues mentioned by automatic dependency checker