Index: b/usr/src/lib/libc/amd64/Makefile
===================================================================
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -1018,7 +1018,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%)
 
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) $(EXTPICS)
 
-MAPFILES =	$(LIBCDIR)/port/mapfile-vers
+MAPFILES =	$(LIBCDIR)/port/mapfile-vers.mog
 
 CPPFLAGS=	-D_REENTRANT -D$(MACH64) -D__$(MACH64) $(THREAD_DEBUG) \
 		-I. -I$(LIBCBASE)/inc -I$(LIBCDIR)/inc $(CPPFLAGS.master)
@@ -1057,6 +1057,7 @@ BUILD.AR= $(RM) $@ ; \
 
 # extra files for the clean target
 CLEANFILES=			\
+	$(LIBCDIR)/port/mapfile-vers.mog \
 	$(LIBCDIR)/port/gen/errlst.c	\
 	$(LIBCDIR)/port/gen/new_list.c	\
 	assym.h			\
Index: b/usr/src/lib/libc/i386/Makefile.com
===================================================================
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -1064,7 +1064,7 @@ ALTPICS= $(TRACEOBJS:%=pics/%)
 $(DYNLIB) := BUILD.SO = $(LD) -o $@ -G $(DYNFLAGS) $(PICS) $(ALTPICS) \
 		$(EXTPICS) $(LDLIBS)
 
-MAPFILES =	$(LIBCDIR)/port/mapfile-vers
+MAPFILES =	$(LIBCDIR)/port/mapfile-vers.mog
 
 #
 # EXTN_CPPFLAGS and EXTN_CFLAGS set in enclosing Makefile
@@ -1114,6 +1114,7 @@ BUILD.AR= $(RM) $@ ; \
 
 # extra files for the clean target
 CLEANFILES=			\
+	$(LIBCDIR)/port/mapfile-vers.mog \
 	$(LIBCDIR)/port/gen/errlst.c	\
 	$(LIBCDIR)/port/gen/new_list.c	\
 	assym.h			\
Index: b/usr/src/lib/libc/Makefile.targ
===================================================================
--- a/usr/src/lib/libc/Makefile.targ
+++ b/usr/src/lib/libc/Makefile.targ
@@ -26,6 +26,12 @@
 
 # libc build rules
 
+$(LIBCDIR)/port/mapfile-vers.mog: $(LIBCDIR)/port/mapfile-vers
+	 sed -r \
+	-e "s,/usr/lib/ld.so.1,$(DEB_LIBDIR_32)/ld.so.1," \
+	-e "s,/usr/lib/amd64/ld.so.1,$(DEB_LIBDIR_64)/ld.so.1," \
+	$< > $@
+
 #
 # This first rule picks up optimized sources for libc variants.
 #