diff --git a/ChangeLog b/ChangeLog
index 4af996fa..3c6faa60 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@
 	* lib/tcbfuncs.c: Include shadowio.h, needed for the
 	spw_setdbname's prototype.
 	* lib/tcbfuncs.c: Ignore fflush() return value.
+	* lib/tcbfuncs.c: Avoid implicit signed to unsigned conversions.
 
 2010-03-17  Nicolas François  <nicolas.francois@centraliens.net>
 
diff --git a/lib/tcbfuncs.c b/lib/tcbfuncs.c
index 21833380..b6518513 100644
--- a/lib/tcbfuncs.c
+++ b/lib/tcbfuncs.c
@@ -101,7 +101,7 @@ static char *shadowtcb_path_rel_existing(const char *name)
 	char *path, *rval;
 	struct stat st;
 	char link[8192];
-	int ret;
+	ssize_t ret;
 
 	if (asprintf(&path, TCB_DIR "/%s", name) == -1) {
 		OUT_OF_MEMORY;
@@ -133,12 +133,12 @@ static char *shadowtcb_path_rel_existing(const char *name)
 		return NULL;
 	}
 	free(path);
-	if (ret >= sizeof(link) - 1) {
+	if ((size_t)ret >= sizeof(link) - 1) {
 		link[sizeof(link) - 1] = '\0';
 		fprintf(stderr, _("%s: Suspiciously long symlink: %s\n"), Prog, link);
 		return NULL;
 	}
-	link[ret] = '\0';
+	link[(size_t)ret] = '\0';
 	rval = strdup(link);
 	if (NULL == rval) {
 		OUT_OF_MEMORY;