diff --git a/Makefile b/Makefile
index 2401e791..4f23c630 100644
--- a/Makefile
+++ b/Makefile
@@ -131,7 +131,7 @@ strlcpy.o: $(MXMLDIR)/strlcpy.c $(MXMLDIR)/strlcpy.h
 elogd: src/elogd.c regex.o crypt.o auth.o mxml.o
 	$(CC) $(CFLAGS) -o elogd src/elogd.c crypt.o auth.o regex.o mxml.o $(LIBS)
 
-elog: src/elog.c crypt.o
+elog: src/elog.c crypt.o $(LIBS)
 	$(CC) $(CFLAGS) -o elog src/elog.c crypt.o $(LIBS)
 
 debug: src/elogd.c regex.o crypt.o auth.o mxml.o
diff --git a/src/elog.c b/src/elog.c
index 8b041b55..b2d90e31 100755
--- a/src/elog.c
+++ b/src/elog.c
@@ -57,6 +57,8 @@ char svn_revision[] = "$Id$";
 #include <openssl/ssl.h>
 #endif
 
+#include "strlcpy.h"
+
 typedef int INT;
 
 #define MAX_ATTACHMENTS  50
@@ -128,80 +130,6 @@ int equal_ustring(char *str1, char *str2)
    return 1;
 }
 
-/*---- strlcpy and strlcat to avoid buffer overflow ----------------*/
-
-#ifdef strlcpy
-#define STRLCPY_DEFINED
-#endif
-
-#ifndef STRLCPY_DEFINED
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless size == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t strlcpy(char *dst, const char *src, size_t size)
-{
-   char *d = dst;
-   const char *s = src;
-   size_t n = size;
-
-   /* Copy as many bytes as will fit */
-   if (n != 0 && --n != 0) {
-      do {
-         if ((*d++ = *s++) == 0)
-            break;
-      } while (--n != 0);
-   }
-
-   /* Not enough room in dst, add NUL and traverse rest of src */
-   if (n == 0) {
-      if (size != 0)
-         *d = '\0';             /* NUL-terminate dst */
-      while (*s++);
-   }
-
-   return (s - src - 1);        /* count does not include NUL */
-}
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless size <= strlen(dst)).
- * Returns strlen(src) + MIN(size, strlen(initial dst)).
- * If retval >= size, truncation occurred.
- */
-size_t strlcat(char *dst, const char *src, size_t size)
-{
-   char *d = dst;
-   const char *s = src;
-   size_t n = size;
-   size_t dlen;
-
-   /* Find the end of dst and adjust bytes left but don't go past end */
-   while (n-- != 0 && *d != '\0')
-      d++;
-   dlen = d - dst;
-   n = size - dlen;
-
-   if (n == 0)
-      return (dlen + strlen(s));
-   while (*s != '\0') {
-      if (n != 1) {
-         *d++ = *s;
-         n--;
-      }
-      s++;
-   }
-   *d = '\0';
-
-   return (dlen + (s - src));   /* count does not include NUL */
-}
-
-#endif                          // STRLCPY_DEFINED
-
-
 char *sha256_crypt(const char *key, const char *salt);
 
 void do_crypt(char *s, char *d, int size)