diff --git a/ChangeLog b/ChangeLog
index e4d6d47d..19fec798 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -147,6 +147,8 @@
 	- The word is "runlist", not "run_list", "run list", or "run-list".
 	- Prefix all functions with "ntfs_" and make the names of the form
 	  "ntfs_object_action()". Keep this for all future functions!
+	- Change unistr.c::ntfs_names_are_equal() to return TRUE when both
+	  names have zero length. Thanks to Leonard Norrgard for spotting this.
 
 12/03/2002 - 1.6.0 - More mkntfs options and cleanups.
 	Fix typo in usage information of mkntfs. Thanks to Richard Russon for
diff --git a/libntfs/unistr.c b/libntfs/unistr.c
index 459321e6..51c00015 100644
--- a/libntfs/unistr.c
+++ b/libntfs/unistr.c
@@ -77,7 +77,7 @@ BOOL ntfs_names_are_equal(const uchar_t *s1, size_t s1_len,
 	if (s1_len != s2_len)
 		return FALSE;
 	if (!s1_len)
-		return 0;
+		return TRUE;
 	if (ic == CASE_SENSITIVE)
 		return ntfs_ucsncmp(s1, s2, s1_len << 1) ? FALSE: TRUE;
 	return ntfs_ucsncasecmp(s1, s2, s1_len, upcase, upcase_size) ? FALSE: