diff --git a/ucarp/Makefile b/ucarp/Makefile
index 76a141bc0e..9dec120c79 100644
--- a/ucarp/Makefile
+++ b/ucarp/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/04/29 20:52:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/06/13 19:57:42 ppostma Exp $
 #
 
-DISTNAME=		ucarp-0.6
+DISTNAME=		ucarp-0.8
 CATEGORIES=		net
 MASTER_SITES=		http://www.pureftpd.org/ucarp/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/ucarp/distinfo b/ucarp/distinfo
index 48996c1c88..6f6613d1a2 100644
--- a/ucarp/distinfo
+++ b/ucarp/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/04/29 20:52:10 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/06/13 19:57:42 ppostma Exp $
 
-SHA1 (ucarp-0.6.tar.bz2) = f9fe68ff4c2e549e4bb3cdaf4257ddf63a58a7d2
-Size (ucarp-0.6.tar.bz2) = 87030 bytes
+SHA1 (ucarp-0.8.tar.bz2) = b05a4c573ddf61a15e02f22163a36a00d9c673ac
+Size (ucarp-0.8.tar.bz2) = 87693 bytes
+SHA1 (patch-aa) = ac245eb1cd2a64d8352b14d8efdc59a87a6f8ceb
diff --git a/ucarp/patches/patch-aa b/ucarp/patches/patch-aa
new file mode 100644
index 0000000000..d874e85dee
--- /dev/null
+++ b/ucarp/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2004/06/13 19:57:43 ppostma Exp $
+
+--- src/ucarp.h.orig	2004-05-08 19:38:18.000000000 +0200
++++ src/ucarp.h	2004-06-13 21:47:27.000000000 +0200
+@@ -51,6 +51,8 @@
+ #include <poll.h>
+ #include <pcap.h>
+ 
++#include <limits.h>
++
+ #include "mysnprintf.h"
+ #include "crypto.h"
+ #ifndef USE_SYSTEM_CRYPT_SHA1