diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index e0ad21b683872c8610a373c8a4fa87521eda56cf..ed64e654fdcfaf61d5ba208f8960d6ca65746935 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -86,10 +86,12 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; }
 {- output_on() if $disabled{makedepend}; "" -}
 GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_info{generate}}) -}
 
+{- output_off() if $disabled{apps}; "" -}
 BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash
 MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \
 	     $(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \
 	     $(BLDDIR)/apps/CA.pl $(BLDDIR)/apps/tsget
+{- output_on() if $disabled{apps}; "" -}
 
 SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -}
 
diff --git a/tools/build.info b/tools/build.info
index 4010fd4f3a9f9d421e1c96bb26a129f30ca4aff4..3810fbcbe08f19aab6e732491981f754be570fce 100644
--- a/tools/build.info
+++ b/tools/build.info
@@ -1,2 +1,4 @@
-SCRIPTS=c_rehash
-SOURCE[c_rehash]=c_rehash.in
+IF[{- !$disabled{apps} -}]
+  SCRIPTS=c_rehash
+  SOURCE[c_rehash]=c_rehash.in
+ENDIF