diff --git a/CHANGELOG b/CHANGELOG
index e509ac089f..1aec75d953 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,10 @@
 Changes for U-Boot 1.1.4:
 ======================================================================
 
+* Fix loop end test in lib_generic/string.c:strswab()
+  Patch by Andrew Dyer, October 10, 2005
+  Signed-off-by: Andrew Dyer <amdyer@gmail.com>
+
 * Cleanup
 
 * Update ARM Integrator boards:
diff --git a/lib_generic/string.c b/lib_generic/string.c
index dea4d69a9b..0e99d1b2b5 100644
--- a/lib_generic/string.c
+++ b/lib_generic/string.c
@@ -380,7 +380,7 @@ char *strswab(const char *s)
 		return (NULL);
 	}
 
-	for (p=(char *)s, q=p+1; (*p != '\0') && (*p != '\0'); p+=2, q+=2) {
+	for (p=(char *)s, q=p+1; (*p != '\0') && (*q != '\0'); p+=2, q+=2) {
 		char  tmp;
 
 		tmp = *p;