diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index 01256bb..8122ec5 100644
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,9 @@
+2004-05-11 Paul Jakma <paul@dishone.st>
+
+	* ripng_nexthop.h: SUNOS_5 does not define s6_addr32
+	  catch ifndef(s6_addr32) && defined(SUNOS_5) and define
+	  it ourselves based on the S10 _KERNEL guarded define.
+	  
 2004-05-08 Paul Jakma <paul@dishone.st>
 
 	* ripng_{interface,zebra}.c: sync with zclient changes
diff --git a/ripngd/ripng_nexthop.h b/ripngd/ripng_nexthop.h
index 2213fc2..50a86ad 100644
--- a/ripngd/ripng_nexthop.h
+++ b/ripngd/ripng_nexthop.h
@@ -43,7 +43,12 @@
 addr6_cmp(struct in6_addr *A, struct in6_addr *B) {
 
 #ifndef s6_addr32
+#if defined(SUNOS_5)
+/* Some SunOS define s6_addr32 only to kernel */
+#define s6_addr32 _S6_un._S6_u32
+#else
 #define s6_addr32 __u6_addr.__u6_addr32
+#endif /* SUNOS_5 */
 #endif /*s6_addr32*/
 
 #define a(i) A->s6_addr32[i]