diff --git a/net/fping/Makefile b/net/fping/Makefile
index 7c3b726543b64..84d9c24b49c8a 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2012/10/23 17:18:21 asau Exp $
+# $NetBSD: Makefile,v 1.14 2014/05/09 15:28:53 sborrill Exp $
 
-DISTNAME=	fping-2.4b2_to
-PKGNAME=	fping-2.4b2
-PKGREVISION=	1
+DISTNAME=	fping-3.10
 CATEGORIES=	net
-MASTER_SITES=	http://www.fping.com/download/
+MASTER_SITES=	http://fping.org/dist/
 
 MAINTAINER=	abs@NetBSD.org
-HOMEPAGE=	http://www.fping.com/
+HOMEPAGE=	http://www.fping.org/
 COMMENT=	Quickly ping many hosts w/o flooding the network
 
 GNU_CONFIGURE=	YES
diff --git a/net/fping/distinfo b/net/fping/distinfo
index c7d852e6c9840..3f3245f94038c 100644
--- a/net/fping/distinfo
+++ b/net/fping/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2005/02/24 12:13:46 agc Exp $
+$NetBSD: distinfo,v 1.8 2014/05/09 15:28:53 sborrill Exp $
 
-SHA1 (fping-2.4b2_to.tar.gz) = 9318f2ec4b389cd74ca32f561fea95f9528f16a3
-RMD160 (fping-2.4b2_to.tar.gz) = 643af0593e42a78534026498adc544bf21afe4fd
-Size (fping-2.4b2_to.tar.gz) = 60968 bytes
-SHA1 (patch-aa) = df15ec2bd474636c0950b465f918791657b7f5d8
+SHA1 (fping-3.10.tar.gz) = d8a1fa3ec13289d67d70102c1ef16c461a7eb505
+RMD160 (fping-3.10.tar.gz) = ca957b5f629b6e32ab5592644a4fa75d7f737e07
+Size (fping-3.10.tar.gz) = 157010 bytes
+SHA1 (patch-aa) = 7a5c2a99abd08797b8567ff23bfe6764ba585cbf
diff --git a/net/fping/patches/patch-aa b/net/fping/patches/patch-aa
index 9db9cb743c528..6c38dbe651bfe 100644
--- a/net/fping/patches/patch-aa
+++ b/net/fping/patches/patch-aa
@@ -1,17 +1,16 @@
-$NetBSD: patch-aa,v 1.6 2003/09/04 12:47:38 abs Exp $
+$NetBSD: patch-aa,v 1.7 2014/05/09 15:28:53 sborrill Exp $
 
---- fping.c.orig	Fri Jul 20 18:10:26 2001
-+++ fping.c
-@@ -1547,8 +1547,10 @@ int wait_for_reply( void )
- 
- 	ip = ( struct ip* )buffer;
+--- src/fping.c.orig	2014-05-04 21:33:12.000000000 +0100
++++ src/fping.c	2014-05-09 16:25:45.000000000 +0100
+@@ -1521,8 +1521,10 @@
  
+     ip = ( struct ip* )buffer;
+ #ifndef IPV6
 -#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ )
--	/* The alpha headers are decidedly broken.
 +#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) && !defined( __NetBSD__ )
-+	/* The alpha headers are decidedly broken. 
-+	 * XXX _WHAT_ 'alpha'? OSF? True64? Linux?... Certainly not NetBSD
-+	 * XXX If defining for a particular broken OS then _include the OS_.
- 	 * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
- 	 * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
- 	 */
+     /* The alpha headers are decidedly broken.
++     * XXX _WHAT_ 'alpha'? OSF? True64? Linux?... Certainly not NetBSD
++     * XXX If defining for a particular broken OS then _include the OS_.
+      * Using an ANSI compiler, it provides ip_vhl instead of ip_hl and
+      * ip_v.  So, to get ip_hl, we mask off the bottom four bits.
+      */