diff --git a/ChangeLog b/ChangeLog
index ceee623d95..29a8e7c163 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@
 
 2000-07-03  Greg McGary  <greg@mcgary.org>
 
+	* csu/Makefile (extra-objs, install-lib): Add BP objects conditionally.
+	($(objpfx)b$(start-installed-name)): Add non-elf rule.
+
 	* libio/libio.h (_IO_FILE): Revert type of _chain to _IO_FILE*.
 	* libio/libioP.h (_IO_ITER): Revert to type _IO_FILE*.
 	(FILEBUF_LITERAL): Add cast for CHAIN init.
diff --git a/csu/Makefile b/csu/Makefile
index a50a44f676..2b697a7079 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -30,12 +30,14 @@ subdir := csu
 routines = init-first libc-start $(libc-init) sysdep version check_fds
 csu-dummies = $(filter-out $(start-installed-name),crt1.o Mcrt1.o)
 extra-objs = start.o gmon-start.o \
-	     $(start-installed-name) g$(start-installed-name) b$(start-installed-name) \
-	     $(csu-dummies)
+	     $(start-installed-name) g$(start-installed-name) $(csu-dummies)
 omit-deps = $(patsubst %.o,%,$(start-installed-name) g$(start-installed-name) \
 			      b$(start-installed-name) $(csu-dummies))
-install-lib = $(start-installed-name) g$(start-installed-name) b$(start-installed-name) \
-	      $(csu-dummies)
+install-lib = $(start-installed-name) g$(start-installed-name) $(csu-dummies)
+ifeq (yes,$(build-bounded))
+extra-objs += b$(start-installed-name)
+install-lib += b$(start-installed-name)
+endif
 distribute = initfini.c gmon-start.c start.c defs.awk munch.awk \
 	     abi-note.S init.c munch-tmpl.c
 generated = version-info.h
@@ -139,6 +141,9 @@ else
 $(objpfx)$(start-installed-name): $(objpfx)start.o
 	rm -f $@
 	ln $< $@
+$(objpfx)b$(start-installed-name): $(objpfx)start.ob
+	rm -f $@
+	ln $< $@
 endif
 endif