diff --git a/net/fping/Makefile b/net/fping/Makefile
index 6847b3e87a2..f864bdcb56f 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.39 2017/01/12 14:28:54 sthen Exp $
+# $OpenBSD: Makefile,v 1.40 2017/02/10 14:23:49 sthen Exp $
 
 COMMENT=	quickly ping N hosts w/o flooding the network
 
-DISTNAME=	fping-3.15
+DISTNAME=	fping-3.16
 
 CATEGORIES=	net
 
diff --git a/net/fping/distinfo b/net/fping/distinfo
index d2b6ab9ee38..281015255c1 100644
--- a/net/fping/distinfo
+++ b/net/fping/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fping-3.15.tar.gz) = lpSPaDW+6JJfJVb98Ye1nHfAZSTi78ct3yv8y1OFUhw=
-SIZE (fping-3.15.tar.gz) = 159314
+SHA256 (fping-3.16.tar.gz) = L3UwlOTfPNsdmb4Wh8D7fS8UwNUm6/AxWMjFUZvHj1Q=
+SIZE (fping-3.16.tar.gz) = 162629
diff --git a/net/fping/patches/patch-src_fping_c b/net/fping/patches/patch-src_fping_c
index 0a1aa7c65eb..d9266652c98 100644
--- a/net/fping/patches/patch-src_fping_c
+++ b/net/fping/patches/patch-src_fping_c
@@ -1,7 +1,7 @@
-$OpenBSD: patch-src_fping_c,v 1.3 2017/01/12 14:28:54 sthen Exp $
---- src/fping.c.orig	Wed Jan 11 09:07:47 2017
-+++ src/fping.c	Thu Jan 12 14:28:05 2017
-@@ -375,6 +375,9 @@ int main( int argc, char **argv )
+$OpenBSD: patch-src_fping_c,v 1.4 2017/02/10 14:23:49 sthen Exp $
+--- src/fping.c.orig	Thu Feb  9 09:22:25 2017
++++ src/fping.c	Fri Feb 10 14:21:23 2017
+@@ -364,6 +364,9 @@ int main(int argc, char** argv)
              perror("cannot setuid");
      }
  
@@ -11,9 +11,9 @@ $OpenBSD: patch-src_fping_c,v 1.3 2017/01/12 14:28:54 sthen Exp $
      ident = getpid() & 0xFFFF;
      verbose_flag = 1;
      backoff_flag = 1;
-@@ -589,6 +592,11 @@ int main( int argc, char **argv )
-         }/* SWITCH */
-     }/* WHILE */
+@@ -583,6 +586,11 @@ int main(int argc, char** argv)
+         }
+     }
  
 +    if (!filename) { /* drop rpath if not reading addrs from file */
 +        if (pledge("stdio inet dns", NULL) == -1)
@@ -23,11 +23,10 @@ $OpenBSD: patch-src_fping_c,v 1.3 2017/01/12 14:28:54 sthen Exp $
      /* validate various option settings */
  
      if (ttl > 255) {
-@@ -806,6 +814,14 @@ int main( int argc, char **argv )
-     else {
-         usage(1);
+@@ -798,6 +806,14 @@ int main(int argc, char** argv)
+         exit(num_noaddress ? 2 : 1);
      }
-+
+ 
 +    if (name_flag) { /* done with file, drop rpath */
 +        if (pledge("stdio inet dns", NULL) == -1)
 +            perror("pledge");
@@ -35,15 +34,16 @@ $OpenBSD: patch-src_fping_c,v 1.3 2017/01/12 14:28:54 sthen Exp $
 +        if (pledge("stdio inet", NULL) == -1)
 +            perror("pledge");
 +    }
-     
-     if(!num_hosts) {
-         exit(num_noaddress ? 2 : 1);
-@@ -1623,7 +1639,7 @@ int wait_for_reply(long wait_time)
++
+     if (src_addr_present) {
+         socket_set_src_addr(s, src_addr);
+     }
+@@ -1667,7 +1683,7 @@ int wait_for_reply(long wait_time)
  
  #ifndef IPV6
-     ip = ( struct ip* )buffer;
--#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ )
-+#if defined( __alpha__ ) && __STDC__ && !defined( __GLIBC__ ) && !defined(__OpenBSD__)
+     ip = (struct ip*)buffer;
+-#if defined(__alpha__) && __STDC__ && !defined(__GLIBC__)
++#if defined(__alpha__) && __STDC__ && !defined(__GLIBC__) && !defined(__OpenBSD__)
      /* The alpha headers are decidedly broken.
       * 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.