diff --git a/lib/des/Makefile.in b/lib/des/Makefile.in
index 746d31b90..8d40b6b05 100644
--- a/lib/des/Makefile.in
+++ b/lib/des/Makefile.in
@@ -26,8 +26,9 @@ PICFLAGS = @PICFLAGS@
  
 PROGS = destest mdtest des rpw speed
 PROGS2INSTALL = des
-LIBNAME = libdes
+LIBNAME = $(LIBPREFIX)des
 LIBEXT = @LIBEXT@
+LIBPREFIX = @LIBPREFIX@
 SHLIBEXT = @SHLIBEXT@
 SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT)
diff --git a/lib/editline/Makefile.in b/lib/editline/Makefile.in
index 2c138eb49..3db116ca1 100644
--- a/lib/editline/Makefile.in
+++ b/lib/editline/Makefile.in
@@ -23,9 +23,10 @@ libdir = $(exec_prefix)/lib
 
 PICFLAGS = @PICFLAGS@
  
-LIBNAME = libeditline
+LIBNAME = $(LIBPREFIX)editline
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
+LIBPREFIX = @LIBPREFIX@
 SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
 
diff --git a/lib/kafs/Makefile.in b/lib/kafs/Makefile.in
index 436de1710..b3c6a1abb 100644
--- a/lib/kafs/Makefile.in
+++ b/lib/kafs/Makefile.in
@@ -23,9 +23,10 @@ libdir = $(exec_prefix)/lib
 
 PICFLAGS = @PICFLAGS@
  
-LIBNAME = libkafs
+LIBNAME = $(LIBPREFIX)kafs
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
+LIBPREFIX = @LIBPREFIX@
 SHARED = @SHARED@
 AFS_EXTRA_LIBS	= @AFS_EXTRA_LIBS@
 LIB = $(LIBNAME).$(LIBEXT) $(AFS_EXTRA_LIBS)
diff --git a/lib/otp/Makefile.in b/lib/otp/Makefile.in
index b64d7460a..17ce517c1 100644
--- a/lib/otp/Makefile.in
+++ b/lib/otp/Makefile.in
@@ -24,9 +24,10 @@ libdir = $(exec_prefix)/lib
 
 PICFLAGS = @PICFLAGS@
  
-LIBNAME = libotp
+LIBNAME = $(LIBPREFIX)otp
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
+LIBPREFIX = @LIBPREFIX@
 SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 PROGS = otptest
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index 021938672..302f9a9a9 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -24,9 +24,10 @@ libdir = $(exec_prefix)/lib
 
 PICFLAGS = # @PICFLAGS@
  
-LIBNAME = libroken
+LIBNAME = $(LIBPREFIX)roken
 #LIBEXT = @LIBEXT@ Always build archive library and don't install!
 LIBEXT = a
+LIBPREFIX = @LIBPREFIX@
 SHLIBEXT = @SHLIBEXT@
 SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT)
diff --git a/lib/sl/Makefile.in b/lib/sl/Makefile.in
index a52b15aa2..e761666e7 100644
--- a/lib/sl/Makefile.in
+++ b/lib/sl/Makefile.in
@@ -23,9 +23,10 @@ libdir = $(exec_prefix)/lib
 
 PICFLAGS = @PICFLAGS@
  
-LIBNAME = libsl
+LIBNAME = $(LIBPREFIX)sl
 LIBEXT = @LIBEXT@
 SHLIBEXT = @SHLIBEXT@
+LIBPREFIX = @LIBPREFIX@
 SHARED = @SHARED@
 LIB = $(LIBNAME).$(LIBEXT)
 PROGS =