diff --git a/lib/roken/inet_ntop.c b/lib/roken/inet_ntop.c
index 71869c76d..111703448 100644
--- a/lib/roken/inet_ntop.c
+++ b/lib/roken/inet_ntop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999 Kungliga Tekniska Högskolan
+ * Copyright (c) 1999 - 2001 Kungliga Tekniska Högskolan
  * (Royal Institute of Technology, Stockholm, Sweden).
  * All rights reserved.
  * 
@@ -92,7 +92,7 @@ inet_ntop_v6 (const void *src, char *dst, size_t size)
 	return NULL;
     }
     for (i = 0; i < 8; ++i) {
-	int non_zerop = 1;
+	int non_zerop = 0;
 
 	if (non_zerop || (ptr[0] >> 4)) {
 	    *dst++ = xdigits[ptr[0] >> 4];
@@ -106,10 +106,7 @@ inet_ntop_v6 (const void *src, char *dst, size_t size)
 	    *dst++ = xdigits[ptr[1] >> 4];
 	    non_zerop = 1;
 	}
-	if (non_zerop || (ptr[1] & 0x0F)) {
-	    *dst++ = xdigits[ptr[1] & 0x0F];
-	    non_zerop = 1;
-	}
+	*dst++ = xdigits[ptr[1] & 0x0F];
 	if (i != 7)
 	    *dst++ = ':';
 	ptr += 2;