diff --git a/rtems/config/tools/rtems-kernel-4-1.cfg b/rtems/config/tools/rtems-kernel-4-1.cfg
index 4d4bd60..e244939 100644
--- a/rtems/config/tools/rtems-kernel-4-1.cfg
+++ b/rtems/config/tools/rtems-kernel-4-1.cfg
@@ -20,6 +20,13 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
  Source0: http://ftp.rtems.org/ftp/pub/rtems/%{rtems_kernel_version}/rtems-%{rtems_kernel_version}.tar.bz2
 %endif
 
+#
+# If C++ defined for the tool set use it to control RTEMS's setting..
+#
+%ifn %{defined enable_cxx}
+ %define rtems_cxx %{enable_cxx}
+%endif
+
 #
 # Default set up.
 #
@@ -61,8 +68,8 @@ BuildRoot: %{_tmppath}/%{name}-root-%(%{__id_u} -n)
   %{?patch9:%patch9 %{?patch9_opts:%{patch9_opts}}%{!?patch9_opts:-p1}}
 %if %{rtems_bootstrap}
   ./bootstrap -c
-  ./bootstrap -p
-  ./bootstrap
+  %{_sbdir}/sb-bootstrap --preinstall
+  %{_sbdir}/sb-bootstrap
 %endif
   cd ..