diff --git a/lib/roken/Makefile.am b/lib/roken/Makefile.am
index 65803155a..71b1b3a75 100644
--- a/lib/roken/Makefile.am
+++ b/lib/roken/Makefile.am
@@ -45,8 +45,6 @@ libroken_la_SOURCES =		\
 	simple_exec.c		\
 	snprintf.c		\
 	socket.c		\
-	strcat_truncate.c	\
-	strcpy_truncate.c	\
 	tm2time.c		\
 	verify.c		\
 	warnerr.c		\
@@ -98,6 +96,8 @@ EXTRA_libroken_la_SOURCES =	\
 	strdup.c		\
 	strerror.c		\
 	strftime.c		\
+	strlcat.c		\
+	strlcpy.c		\
 	strlwr.c		\
 	strncasecmp.c		\
 	strndup.c		\
diff --git a/lib/roken/Makefile.in b/lib/roken/Makefile.in
index e8f5e6f0e..c479a5fbd 100644
--- a/lib/roken/Makefile.in
+++ b/lib/roken/Makefile.in
@@ -93,11 +93,11 @@ SOURCES = \
 	snprintf.c \
 	socket.c \
 	strcasecmp.c \
-	strcat_truncate.c \
-	strcpy_truncate.c \
 	strdup.c \
 	strerror.c \
 	strftime.c \
+	strlcat.c \
+	strlcpy.c \
 	strlwr.c \
 	strncasecmp.c \
 	strndup.c \
@@ -143,8 +143,6 @@ OBJECTS = \
 	print_version.o \
 	resolve.o \
 	roken_gethostby.o \
-	strcat_truncate.o \
-	strcpy_truncate.o \
 	signal.o \
 	simple_exec.o \
 	snprintf.o \