diff --git a/WINGs/Makefile.am b/WINGs/Makefile.am
index 82ea4514..903caad7 100644
--- a/WINGs/Makefile.am
+++ b/WINGs/Makefile.am
@@ -15,7 +15,7 @@ wraster = $(top_builddir)/wrlib/libwraster.la
 
 LDADD= libWUtil.la libWINGs.la $(wraster) $(wutilrs) @INTLIBS@
 libWINGs_la_LIBADD = libWUtil.la $(wraster) $(wutilrs) @XLIBS@ @XFT_LIBS@ @FCLIBS@ @LIBM@ @PANGO_LIBS@
-libWUtil_la_LIBADD = @LIBBSD@ $(wutilrs)
+libWUtil_la_LIBADD = $(wutilrs)
 
 EXTRA_DIST = BUGS make-rgb Examples Extras Tests
 
diff --git a/WINGs/WINGs/WUtil.h b/WINGs/WINGs/WUtil.h
index 18c8b52b..25296206 100644
--- a/WINGs/WINGs/WUtil.h
+++ b/WINGs/WINGs/WUtil.h
@@ -271,9 +271,6 @@ char* wstrconcat(const char *str1, const char *str2);
  * so always assign the returned address to avoid dangling pointers. */
 char* wstrappend(char *dst, const char *src);
 
-size_t wstrlcpy(char *, const char *, size_t);
-size_t wstrlcat(char *, const char *, size_t);
-
 
 void wtokensplit(char *command, char ***argv, int *argc);
 
diff --git a/WINGs/dragsource.c b/WINGs/dragsource.c
index d70d7993..c6bb9466 100644
--- a/WINGs/dragsource.c
+++ b/WINGs/dragsource.c
@@ -498,7 +498,7 @@ static void registerDescriptionList(WMScreen * scr, WMView * view, WMArray * ope
 
 	for (i = 0; i < count; i++) {
 		text = WMGetDragOperationItemText(WMGetFromArray(operationArray, i));
-		wstrlcpy(textListItem, text, size);
+		strlcpy(textListItem, text, size);
 
 		/* to next text offset */
 		textListItem = &(textListItem[strlen(textListItem) + 1]);
diff --git a/WINGs/findfile.c b/WINGs/findfile.c
index 10c26b3b..c4f23093 100644
--- a/WINGs/findfile.c
+++ b/WINGs/findfile.c
@@ -76,8 +76,8 @@ char *wfindfileinarray(WMPropList *array, const char *file)
 		path = wmalloc(len + flen + 2);
 		path = memcpy(path, p, len);
 		path[len] = 0;
-		if (wstrlcat(path, "/", len + flen + 2) >= len + flen + 2 ||
-		    wstrlcat(path, file, len + flen + 2) >= len + flen + 2) {
+		if (strlcat(path, "/", len + flen + 2) >= len + flen + 2 ||
+		    strlcat(path, file, len + flen + 2) >= len + flen + 2) {
 			wfree(path);
 			return NULL;
 		}
diff --git a/WINGs/menuparser_macros.c b/WINGs/menuparser_macros.c
index 8c12f2de..56930c06 100644
--- a/WINGs/menuparser_macros.c
+++ b/WINGs/menuparser_macros.c
@@ -652,7 +652,7 @@ static void mpm_get_hostname(WParserMacro *this, WMenuParser parser)
 			return;
 		}
 	}
-	wstrlcpy((char *) this->value, h, sizeof(this->value) );
+	strlcpy((char *) this->value, h, sizeof(this->value) );
 }
 
 /* Name of the current user */
@@ -677,7 +677,7 @@ static void mpm_get_user_name(WParserMacro *this, WMenuParser parser)
 		user = pw_user->pw_name;
 		if (user == NULL) goto error_no_username;
 	}
-	wstrlcpy((char *) this->value, user, sizeof(this->value) );
+	strlcpy((char *) this->value, user, sizeof(this->value) );
 }
 
 /* Number id of the user under which we are running */
diff --git a/WINGs/string.c b/WINGs/string.c
index 393f2887..4851b6f7 100644
--- a/WINGs/string.c
+++ b/WINGs/string.c
@@ -132,20 +132,20 @@ char *wtokenjoin(char **list, int count)
 	for (i = 0; i < count; i++) {
 		if (list[i] != NULL && list[i][0] != 0) {
 			if (i > 0 &&
-			    wstrlcat(flat_string, " ", j + count + 1) >= j + count + 1)
+			    strlcat(flat_string, " ", j + count + 1) >= j + count + 1)
 					goto error;
 
 			wspace = strpbrk(list[i], " \t");
 
 			if (wspace &&
-			    wstrlcat(flat_string, "\"", j + count + 1) >= j + count + 1)
+			    strlcat(flat_string, "\"", j + count + 1) >= j + count + 1)
 					goto error;
 
-			if (wstrlcat(flat_string, list[i], j + count + 1) >= j + count + 1)
+			if (strlcat(flat_string, list[i], j + count + 1) >= j + count + 1)
 				goto error;
 
 			if (wspace &&
-			    wstrlcat(flat_string, "\"", j + count + 1) >= j + count + 1)
+			    strlcat(flat_string, "\"", j + count + 1) >= j + count + 1)
 					goto error;
 		}
 	}
@@ -237,189 +237,3 @@ char *wstrappend(char *dst, const char *src)
 
 	return dst;
 }
-
-
-#ifdef HAVE_STRLCAT
-size_t
-wstrlcat(char *dst, const char *src, size_t siz)
-{
-	return strlcat(dst, src, siz);
-}
-#else
-/*	$OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * 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 siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-wstrlcat(char *dst, const char *src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-	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 = siz - 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 /* HAVE_STRLCAT */
-
-#ifdef HAVE_STRLCPY
-size_t
-wstrlcpy(char *dst, const char *src, size_t siz)
-{
-	return strlcpy(dst, src, siz);
-}
-#else
-
-/*	$OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert Exp $	*/
-
-/*
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * Copy src to string dst of size siz.  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz == 0).
- * Returns strlen(src); if retval >= siz, truncation occurred.
- */
-size_t
-wstrlcpy(char *dst, const char *src, size_t siz)
-{
-	char *d = dst;
-	const char *s = src;
-	size_t n = siz;
-
-	/* Copy as many bytes as will fit */
-	if (n != 0) {
-		while (--n != 0) {
-			if ((*d++ = *s++) == '\0')
-				break;
-		}
-	}
-
-	/* Not enough room in dst, add NUL and traverse rest of src */
-	if (n == 0) {
-		if (siz != 0)
-			*d = '\0';		/* NUL-terminate dst */
-		while (*s++)
-			;
-	}
-
-	return(s - src - 1);	/* count does not include NUL */
-}
-#endif /* HAVE_STRLCPY */
-
-/* transform `s' so that the result is safe to pass to the shell as an argument.
- * returns a newly allocated string.
- * with very heavy inspirations from NetBSD's shquote(3).
- */
-char *wshellquote(const char *s)
-{
-	char *p, *r, *last, *ret;
-	size_t slen;
-	int needs_quoting;
-
-	if (!s)
-		return NULL;
-
-	needs_quoting = !*s;			/* the empty string does need quoting */
-
-	/* do not quote if consists only of the following characters */
-	for (p = (char *)s; *p && !needs_quoting; p++) {
-		needs_quoting = !(isalnum(*p) || (*p == '+') || (*p == '/') ||
-				 (*p == '.') || (*p == ',') || (*p == '-'));
-	}
-
-	if (!needs_quoting)
-		return wstrdup(s);
-
-	for (slen = 0, p = (char *)s; *p; p++)		/* count space needed (worst case) */
-		slen += *p == '\'' ? 4 : 1;		/* every single ' becomes ''\' */
-
-	slen += 2 /* leading + trailing "'" */ + 1 /* NULL */;
-
-	ret = r = wmalloc(slen);
-	p = (char *)s;
-	last = p;
-
-	if (*p != '\'')					/* if string doesn't already begin with "'" */
-		*r++ ='\'';				/* start putting it in quotes */
-
-	while (*p) {
-		last = p;
-		if (*p == '\'') {			/* turn each ' into ''\' */
-			if (p != s)			/* except if it's the first ', in which case */
-				*r++ = '\'';		/* only escape it */
-			*r++ = '\\';
-			*r++ = '\'';
-			while (*++p && *p == '\'') {	/* keep turning each consecutive 's into \' */
-				*r++ = '\\';
-				*r++ = '\'';
-			}
-			if (*p)				/* if more input follows, terminate */
-				*r++ = '\'';		/* what we have so far */
-		} else {
-			*r++ = *p++;
-		}
-	}
-
-	if (*last != '\'')				/* if the last one isn't already a ' */
-		*r++ = '\'';				/* terminate the whole shebang */
-
-	*r = '\0';
-
-	return ret;					/* technically, we lose (but not leak) a couple of */
-							/* bytes (twice the number of consecutive 's in the */
-							/* input or so), but since these are relatively rare */
-							/* and short-lived strings, not sure if a trip to */
-							/* wstrdup+wfree worths the gain. */
-}
diff --git a/WINGs/wapplication.c b/WINGs/wapplication.c
index 07164ec0..45070a22 100644
--- a/WINGs/wapplication.c
+++ b/WINGs/wapplication.c
@@ -101,21 +101,21 @@ static char *checkFile(const char *path, const char *folder, const char *ext, co
 	slen = strlen(path) + strlen(resource) + 1 + extralen;
 	ret = wmalloc(slen);
 
-	if (wstrlcpy(ret, path, slen) >= slen)
+	if (strlcpy(ret, path, slen) >= slen)
 		goto error;
 
 	if (folder &&
-		(wstrlcat(ret, "/", slen) >= slen ||
-		 wstrlcat(ret, folder, slen) >= slen))
+		(strlcat(ret, "/", slen) >= slen ||
+		 strlcat(ret, folder, slen) >= slen))
 			goto error;
 
 	if (ext &&
-		(wstrlcat(ret, "/", slen) >= slen ||
-		 wstrlcat(ret, ext, slen) >= slen))
+		(strlcat(ret, "/", slen) >= slen ||
+		 strlcat(ret, ext, slen) >= slen))
 			goto error;
 
-	if (wstrlcat(ret, "/", slen) >= slen ||
-	    wstrlcat(ret, resource, slen) >= slen)
+	if (strlcat(ret, "/", slen) >= slen ||
+	    strlcat(ret, resource, slen) >= slen)
 		goto error;
 
 	if (access(ret, F_OK) != 0)
diff --git a/WINGs/wbrowser.c b/WINGs/wbrowser.c
index 4465b73c..b25bc8c1 100644
--- a/WINGs/wbrowser.c
+++ b/WINGs/wbrowser.c
@@ -720,14 +720,14 @@ char *WMGetBrowserPathToColumn(WMBrowser * bPtr, int column)
 	path = wmalloc(slen);
 	/* ignore first `/' */
 	for (i = 0; i <= column; i++) {
-		if (wstrlcat(path, bPtr->pathSeparator, slen) >= slen)
+		if (strlcat(path, bPtr->pathSeparator, slen) >= slen)
 			goto error;
 
 		item = WMGetListSelectedItem(bPtr->columns[i]);
 		if (!item)
 			break;
 
-		if (wstrlcat(path, item->text, slen) >= slen)
+		if (strlcat(path, item->text, slen) >= slen)
 			goto error;
 
 	}
@@ -782,7 +782,7 @@ WMArray *WMGetBrowserPaths(WMBrowser * bPtr)
 		path = wmalloc(slen);
 		/* ignore first `/' */
 		for (i = 0; i <= column; i++) {
-			wstrlcat(path, bPtr->pathSeparator, slen);
+			strlcat(path, bPtr->pathSeparator, slen);
 			if (i == column) {
 				item = lastItem;
 			} else {
@@ -790,7 +790,7 @@ WMArray *WMGetBrowserPaths(WMBrowser * bPtr)
 			}
 			if (!item)
 				break;
-			wstrlcat(path, item->text, slen);
+			strlcat(path, item->text, slen);
 		}
 		WMAddToArray(paths, path);
 	}
@@ -1130,25 +1130,25 @@ static char *createTruncatedString(WMFont * font, const char *text, int *textLen
 	if (width >= 3 * dLen) {
 		int tmpTextLen = *textLen;
 
-		if (wstrlcpy(textBuf, text, slen) >= slen)
+		if (strlcpy(textBuf, text, slen) >= slen)
 			goto error;
 
 		while (tmpTextLen && (WMWidthOfString(font, textBuf, tmpTextLen) + 3 * dLen > width))
 			tmpTextLen--;
 
-		if (wstrlcpy(textBuf + tmpTextLen, "...", slen) >= slen)
+		if (strlcpy(textBuf + tmpTextLen, "...", slen) >= slen)
 			goto error;
 
 		*textLen = tmpTextLen + 3;
 
 	} else if (width >= 2 * dLen) {
-		if (wstrlcpy(textBuf, "..", slen) >= slen)
+		if (strlcpy(textBuf, "..", slen) >= slen)
 			goto error;
 
 		*textLen = 2;
 
 	} else if (width >= dLen) {
-		if (wstrlcpy(textBuf, ".", slen) >= slen)
+		if (strlcpy(textBuf, ".", slen) >= slen)
 			goto error;
 
 		*textLen = 1;
diff --git a/WINGs/wfilepanel.c b/WINGs/wfilepanel.c
index 1da05355..cb01ca1a 100644
--- a/WINGs/wfilepanel.c
+++ b/WINGs/wfilepanel.c
@@ -513,12 +513,12 @@ static void listDirectoryOnColumn(WMFilePanel * panel, int column, const char *p
 		if (strcmp(dentry->d_name, ".") == 0 || strcmp(dentry->d_name, "..") == 0)
 			continue;
 
-		if (wstrlcpy(pbuf, path, sizeof(pbuf)) >= sizeof(pbuf))
+		if (strlcpy(pbuf, path, sizeof(pbuf)) >= sizeof(pbuf))
 			goto out;
 		if (strcmp(path, "/") != 0 &&
-		    wstrlcat(pbuf, "/", sizeof(pbuf)) >= sizeof(pbuf))
+		    strlcat(pbuf, "/", sizeof(pbuf)) >= sizeof(pbuf))
 			goto out;
-		if (wstrlcat(pbuf, dentry->d_name, sizeof(pbuf)) >= sizeof(pbuf))
+		if (strlcat(pbuf, dentry->d_name, sizeof(pbuf)) >= sizeof(pbuf))
 			goto out;
 
 		if (stat(pbuf, &stat_buf) != 0) {
@@ -626,11 +626,11 @@ static void createDir(WMWidget *widget, void *p_panel)
 	file = wmalloc(slen);
 
 	if (directory &&
-		(wstrlcat(file, directory, slen) >= slen ||
-		 wstrlcat(file, "/", slen) >= slen))
+		(strlcat(file, directory, slen) >= slen ||
+		 strlcat(file, "/", slen) >= slen))
 			goto out;
 
-	if (wstrlcat(file, dirName, slen) >= slen)
+	if (strlcat(file, dirName, slen) >= slen)
 		goto out;
 
 	if (mkdir(file, 00777) != 0) {
diff --git a/WINGs/wfontpanel.c b/WINGs/wfontpanel.c
index c57678ab..884f6ce6 100644
--- a/WINGs/wfontpanel.c
+++ b/WINGs/wfontpanel.c
@@ -558,7 +558,7 @@ static void listFamilies(WMScreen * scr, WMFontPanel * panel)
 		WMListItem *item;
 
 		WM_ITERATE_ARRAY(array, fam, i) {
-			wstrlcpy(buffer, fam->name, sizeof(buffer));
+			strlcpy(buffer, fam->name, sizeof(buffer));
 			item = WMAddListItem(panel->famLs, buffer);
 
 			item->clientData = fam;
@@ -640,7 +640,7 @@ static void familyClick(WMWidget * w, void *data)
 		int top = 0;
 		WMListItem *fitem;
 
-		wstrlcpy(buffer, face->typeface, sizeof(buffer));
+		strlcpy(buffer, face->typeface, sizeof(buffer));
 		if (strcasecmp(face->typeface, "Roman") == 0)
 			top = 1;
 		if (strcasecmp(face->typeface, "Regular") == 0)
@@ -773,7 +773,7 @@ static void setFontPanelFontName(FontPanel * panel, const char *family, const ch
 		int top = 0;
 		WMListItem *fitem;
 
-		wstrlcpy(buffer, face->typeface, sizeof(buffer));
+		strlcpy(buffer, face->typeface, sizeof(buffer));
 		if (strcasecmp(face->typeface, "Roman") == 0)
 			top = 1;
 		if (top)
diff --git a/WINGs/wtextfield.c b/WINGs/wtextfield.c
index feb1d189..f8cf253e 100644
--- a/WINGs/wtextfield.c
+++ b/WINGs/wtextfield.c
@@ -404,7 +404,7 @@ void WMInsertTextFieldText(WMTextField * tPtr, const char *text, int position)
 
 	if (position < 0 || position >= tPtr->textLen) {
 		/* append the text at the end */
-		wstrlcat(tPtr->text, text, tPtr->bufferSize);
+		strlcat(tPtr->text, text, tPtr->bufferSize);
 		tPtr->textLen += len;
 		tPtr->cursorPosition += len;
 		incrToFit(tPtr);
@@ -473,7 +473,7 @@ void WMSetTextFieldText(WMTextField * tPtr, const char *text)
 			tPtr->bufferSize = tPtr->textLen + TEXT_BUFFER_INCR;
 			tPtr->text = wrealloc(tPtr->text, tPtr->bufferSize);
 		}
-		wstrlcpy(tPtr->text, text, tPtr->bufferSize);
+		strlcpy(tPtr->text, text, tPtr->bufferSize);
 	}
 
 	tPtr->cursorPosition = tPtr->selection.position = tPtr->textLen;
diff --git a/WPrefs.app/KeyboardShortcuts.c b/WPrefs.app/KeyboardShortcuts.c
index 8df69a9e..49d94ab7 100644
--- a/WPrefs.app/KeyboardShortcuts.c
+++ b/WPrefs.app/KeyboardShortcuts.c
@@ -365,7 +365,7 @@ char *capture_shortcut(Display *dpy, Bool *capturing, Bool convert_case)
 	if ((numlock_mask != Mod5Mask) && (ev.xkey.state & Mod5Mask))
 		strcat(buffer, "Mod5+");
 
-	wstrlcat(buffer, key, sizeof(buffer));
+	strlcat(buffer, key, sizeof(buffer));
 
 	return wstrdup(buffer);
 }
diff --git a/configure.ac b/configure.ac
index 78313976..72222d7d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,39 +391,6 @@ dnl the flag 'O_NOFOLLOW' for 'open' is used in WINGs
 WM_FUNC_OPEN_NOFOLLOW
 
 
-dnl Check for strlcat/strlcpy
-dnl =========================
-m4_divert_push([INIT_PREPARE])dnl
-AC_ARG_WITH([libbsd],
-  [AS_HELP_STRING([--without-libbsd], [do not use libbsd for strlcat and strlcpy [default=check]])],
-  [AS_IF([test "x$with_libbsd" != "xno"],
-    [with_libbsd=bsd],
-    [with_libbsd=]
-  )],
-  [with_libbsd=bsd])
-m4_divert_pop([INIT_PREPARE])dnl
-
-tmp_libs=$LIBS
-AC_SEARCH_LIBS([strlcat],[$with_libbsd],
-  [AC_DEFINE(HAVE_STRLCAT, 1, [Define if strlcat is available])],
-  [],
-  []
-)
-AC_SEARCH_LIBS([strlcpy],[$with_libbsd],
-  [AC_DEFINE(HAVE_STRLCAT, 1, [Define if strlcpy is available])],
-  [],
-  []
-)
-LIBS=$tmp_libs
-
-LIBBSD=
-AS_IF([test "x$ac_cv_search_strlcat" = "x-lbsd" -o "x$ac_cv_search_strlcpy" = "x-lbsd"],
-  [LIBBSD=-lbsd
-   AC_CHECK_HEADERS([bsd/string.h])]
-)
-AC_SUBST(LIBBSD)
-
-
 dnl Check for OpenBSD kernel memory interface - kvm(3)
 dnl ==================================================
 AS_IF([test "x$WM_OSDEP" = "xbsd"],
diff --git a/src/appmenu.c b/src/appmenu.c
index 11191641..fcc53ac9 100644
--- a/src/appmenu.c
+++ b/src/appmenu.c
@@ -94,7 +94,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win, char **slist, int coun
 		wwarning(_("appmenu: bad menu entry \"%s\" in window %lx"), slist[*index], win);
 		return NULL;
 	}
-	if (wstrlcpy(title, &slist[*index][pos], sizeof(title)) >= sizeof(title)) {
+	if (strlcpy(title, &slist[*index][pos], sizeof(title)) >= sizeof(title)) {
 		wwarning(_("appmenu: menu command size exceeded in window %lx"), win);
 		return NULL;
 	}
@@ -127,7 +127,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win, char **slist, int coun
 						 slist[*index], win);
 					return NULL;
 				}
-				wstrlcpy(title, &slist[*index][pos], sizeof(title));
+				strlcpy(title, &slist[*index][pos], sizeof(title));
 				rtext[0] = 0;
 			} else {
 				if (sscanf(slist[*index], "%i %i %i %i %s %n",
@@ -137,7 +137,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win, char **slist, int coun
 						 slist[*index], win);
 					return NULL;
 				}
-				wstrlcpy(title, &slist[*index][pos], sizeof(title));
+				strlcpy(title, &slist[*index][pos], sizeof(title));
 			}
 			data = wmalloc(sizeof(WAppMenuData));
 			if (data == NULL) {
@@ -174,7 +174,7 @@ static WMenu *parseMenuCommand(WScreen * scr, Window win, char **slist, int coun
 
 				return NULL;
 			}
-			wstrlcpy(title, &slist[*index][pos], sizeof(title));
+			strlcpy(title, &slist[*index][pos], sizeof(title));
 			*index += 1;
 
 			submenu = parseMenuCommand(scr, win, slist, count, index);
diff --git a/src/defaults.c b/src/defaults.c
index 1532692a..e4ef4a21 100644
--- a/src/defaults.c
+++ b/src/defaults.c
@@ -2205,7 +2205,7 @@ static int getKeybind(WScreen * scr, WDefaultEntry * entry, WMPropList * value,
 		return True;
 	}
 
-	wstrlcpy(buf, val, MAX_SHORTCUT_LENGTH);
+	strlcpy(buf, val, MAX_SHORTCUT_LENGTH);
 
 	b = (char *)buf;
 
diff --git a/src/dialog.c b/src/dialog.c
index e1aad51a..7b0298f5 100644
--- a/src/dialog.c
+++ b/src/dialog.c
@@ -605,9 +605,9 @@ static void listPixmaps(WScreen *scr, WMList *lPtr, const char *path)
 		if (strcmp(dentry->d_name, ".") == 0 || strcmp(dentry->d_name, "..") == 0)
 			continue;
 
-		if (wstrlcpy(pbuf, apath, sizeof(pbuf)) >= sizeof(pbuf) ||
-		    wstrlcat(pbuf, "/", sizeof(pbuf)) >= sizeof(pbuf) ||
-		    wstrlcat(pbuf, dentry->d_name, sizeof(pbuf)) >= sizeof(pbuf)) {
+		if (strlcpy(pbuf, apath, sizeof(pbuf)) >= sizeof(pbuf) ||
+		    strlcat(pbuf, "/", sizeof(pbuf)) >= sizeof(pbuf) ||
+		    strlcat(pbuf, dentry->d_name, sizeof(pbuf)) >= sizeof(pbuf)) {
 			wwarning(_("full path for file \"%s\" in \"%s\" is longer than %d bytes, skipped"),
 			         dentry->d_name, path, (int) (sizeof(pbuf) - 1) );
 			continue;
diff --git a/src/rootmenu.c b/src/rootmenu.c
index c7931580..bac0ce10 100644
--- a/src/rootmenu.c
+++ b/src/rootmenu.c
@@ -406,7 +406,7 @@ static Bool addShortcut(const char *file, const char *shortcutDefinition, WMenu
 
 	ptr = wmalloc(sizeof(Shortcut));
 
-	wstrlcpy(buf, shortcutDefinition, MAX_SHORTCUT_LENGTH);
+	strlcpy(buf, shortcutDefinition, MAX_SHORTCUT_LENGTH);
 	b = (char *)buf;
 
 	/* get modifiers */
diff --git a/src/workspace.c b/src/workspace.c
index 6686c1a1..2e4020ac 100644
--- a/src/workspace.c
+++ b/src/workspace.c
@@ -797,7 +797,7 @@ void wWorkspaceMenuUpdate(WScreen * scr, WMenu * menu)
 		i = scr->workspace_count - (menu->entry_no - MC_WORKSPACE1);
 		ws = menu->entry_no - MC_WORKSPACE1;
 		while (i > 0) {
-			wstrlcpy(title, scr->workspaces[ws]->name, MAX_WORKSPACENAME_WIDTH);
+			strlcpy(title, scr->workspaces[ws]->name, MAX_WORKSPACENAME_WIDTH);
 
 			entry = wMenuAddCallback(menu, title, switchWSCommand, (void *)ws);
 			entry->flags.indicator = 1;