diff --git a/zebra/ChangeLog b/zebra/ChangeLog
index 5adcbce..0b54f29 100644
--- a/zebra/ChangeLog
+++ b/zebra/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-19 Paul Jakma <paul@dishone.st>
+
+        * irdp_main.c: update to match sockopt renames.
+        * irdp_packet.c: include sockopt.h and update to match sockopt
+	  renames.
+                
 2004-08-11  Greg Troxel  <gdt@fnord.ir.bbn.com>
 
 	* rtadv.c (rtadv_send_packet): Allocate space for control messages
diff --git a/zebra/irdp_main.c b/zebra/irdp_main.c
index fd56c88..f711d85 100644
--- a/zebra/irdp_main.c
+++ b/zebra/irdp_main.c
@@ -124,7 +124,7 @@
     return ret;
   };
   
-  ret = setsockopt_pktinfo_ipv4 (irdp_sock, 1);
+  ret = setsockopt_pktinfo (AF_INET, irdp_sock, 1);
   if (ret < 0) {
     zlog_warn ("IRDP: can't do irdp sockopt %s", strerror(errno));
     return ret;
diff --git a/zebra/irdp_packet.c b/zebra/irdp_packet.c
index e881ef9..8cd3dad 100644
--- a/zebra/irdp_packet.c
+++ b/zebra/irdp_packet.c
@@ -61,7 +61,7 @@
 #include "if.h"
 #include "sockunion.h"
 #include "log.h"
-
+#include "sockopt.h"
 
 
 /* GLOBAL VARS */
@@ -214,7 +214,7 @@
     return ret;
   }
 
-  ifindex = getsockopt_pktinfo_ifindex (AF_INET, &msg);
+  ifindex = getsockopt_ifindex (AF_INET, &msg);
 
   return ret;
 }