diff --git a/ripd/ChangeLog b/ripd/ChangeLog
index 8ab8a10..1921b78 100644
--- a/ripd/ChangeLog
+++ b/ripd/ChangeLog
@@ -1,3 +1,9 @@
+2004-09-17 Paul Jakma <paul@dishone.st>
+
+	* ripd.c: set receive buffer to a decent size, some systems have low
+	  defaults. Problem noted and fix suggested by Stephan Schweizer
+	  in [zebra 20967].
+
 2004-08-19 Paul Jakma <paul@dishone.st>
 
 	* rip_interface.c: (rip_interface_multicast_set) get rid
diff --git a/ripd/ripd.c b/ripd/ripd.c
index af0e186..5fbb349 100644
--- a/ripd/ripd.c
+++ b/ripd/ripd.c
@@ -42,6 +42,10 @@
 #include "ripd/ripd.h"
 #include "ripd/rip_debug.h"
 
+/* UDP receive buffer size */
+#define RIP_UDP_RCV_BUF 41600
+
+/* privileges global */
 extern struct zebra_privs_t ripd_privs;
 
 /* RIP Structure. */
@@ -1977,6 +1981,7 @@
   sockopt_broadcast (sock);
   sockopt_reuseaddr (sock);
   sockopt_reuseport (sock);
+  setsockopt_so_recvbuf (sock, RIP_UDP_RCV_BUF);
 #ifdef RIP_RECVMSG
   setsockopt_pktinfo (sock);
 #endif /* RIP_RECVMSG */