diff --git a/lib/sl/Makefile.am b/lib/sl/Makefile.am
index 420c798ae..d5763512e 100644
--- a/lib/sl/Makefile.am
+++ b/lib/sl/Makefile.am
@@ -2,6 +2,8 @@
 
 include $(top_srcdir)/Makefile.am.common
 
+INCLUDES += -DROKEN_RENAME
+
 YFLAGS = -d
 
 include_HEADERS = sl.h
@@ -13,13 +15,11 @@ libss_la_LDFLAGS = -version-info 1:3:1
 libsl_la_LIBADD = @LIB_readline@
 libss_la_LIBADD = @LIB_readline@
 
-RENAME_SRC = roken_rename.h strtok_r.c snprintf.c
+RENAME_SRC = roken_rename.h strtok_r.c snprintf.c strdup.c strupr.c
 
-libsl_la_SOURCES = sl_locl.h sl.c
+libsl_la_SOURCES = sl_locl.h sl.c $(RENAME_SRC)
 libss_la_SOURCES = $(libsl_la_SOURCES) ss.c ss.h
 
-EXTRA_libsl_la_SOURCES = strtok_r.c snprintf.c roken_rename.h
-
 # install these?
 
 bin_PROGRAMS = mk_cmds
@@ -33,7 +33,7 @@ EXTRA_mk_cmds_SOURCES = snprintf.c roken_rename.h
 ssincludedir = $(includedir)/ss
 ssinclude_HEADERS = ss.h
 
-CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c
+CLEANFILES = lex.c parse.c parse.h snprintf.c strtok_r.c strdup.c strupr.c
 
 $(mk_cmds_OBJECTS): parse.h
 
@@ -45,3 +45,7 @@ strtok_r.c:
 	$(LN_S) $(srcdir)/../roken/strtok_r.c .
 snprintf.c:
 	$(LN_S) $(srcdir)/../roken/snprintf.c .
+strdup.c:
+	$(LN_S) $(srcdir)/../roken/strdup.c .
+strupr.c:
+	$(LN_S) $(srcdir)/../roken/strupr.c .