diff --git a/net/netselect/Makefile b/net/netselect/Makefile
index 651ad955b84e..820ede8b9957 100644
--- a/net/netselect/Makefile
+++ b/net/netselect/Makefile
@@ -1,33 +1,33 @@
 PORTNAME=	netselect
 PORTVERSION=	0.4
 DISTVERSIONPREFIX=${PORTNAME}-
 CATEGORIES=	net
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Ultrafast implementation of ping
 WWW=		http://apenwarr.ca/netselect/
 
 LICENSE=	BSD3CLAUSE
 
 USES=		gmake
 USE_GITHUB=	yes
-
 GH_ACCOUNT=	apenwarr
 
 OPTIONS_DEFINE=	SUID DOCS
 OPTIONS_SUB=	yes
+
 SUID_DESC=	Install with the setuid bit to allow use by non-root users
 
 do-build:
 	${CC} ${CFLAGS} -o ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.c
 	${REINPLACE_CMD} -E -i "" -e 's|[[:blank:]]+$$||' ${WRKSRC}/README
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/man/man1/${PORTNAME}.1
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/netselect/files/patch-netselect.c b/net/netselect/files/patch-netselect.c
index 413ba24de07e..0d18806d5818 100644
--- a/net/netselect/files/patch-netselect.c
+++ b/net/netselect/files/patch-netselect.c
@@ -1,68 +1,45 @@
 --- netselect.c.orig	2010-10-26 23:08:55 UTC
 +++ netselect.c
-@@ -39,15 +39,14 @@
-  * hey, great!  Let me know. -- apenwarr
-  */
- 
--#ifdef __EMX__
--# include <io.h>
--# include <fcntl.h>
--# include <sys/types.h>
--# include <sys/select.h>
--# include <machine/endian.h>
--#else
--# include <endian.h>
-+#ifdef __linux__
-+#include <endian.h>
-+#elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__)
-+#if defined(__OpenBSD__)
-+#include <machine/types.h>
- #endif
-+#include <machine/endian.h>
-+#endif
- 
- #include <sys/param.h>
- #include <sys/time.h>
-@@ -167,6 +166,7 @@ int main(int argc, char **argv)
+@@ -167,6 +167,7 @@ int main(int argc, char **argv)
      extern int optind;
      int hostcount, startcount, endcount = 0, sent_one, lag, min_lag = 100;
      int ch, seq, ttl, max_ttl = 30, num_score = 1;
 +    int on = 1;
      int use_icmp = 0;
      unsigned int min_tries = 10;
      struct timeval now;
-@@ -280,7 +280,12 @@ int main(int argc, char **argv)
+@@ -280,7 +281,12 @@ int main(int argc, char **argv)
      if (verbose >= 1)
  	fprintf(stderr, "Running netselect to choose %d out of %d address%s.\n",
  		num_score, numhosts, numhosts==1 ? "" : "es");
 -    
 +   
 +   if (setsockopt(sndsock, IPPROTO_IP, IP_HDRINCL, &on, sizeof(on)) < 0) {
 +        perror("IP_HDRINCL");
 +	_exit(EXIT_FAILURE);
 +   }
 +
      /* keep going until most of the hosts have been finished */
      must_continue = numhosts;
      while (must_continue && must_continue >= numhosts/2)
-@@ -774,7 +779,7 @@ static void send_probe(int seq, int ttl, OPacket *op, 
+@@ -774,7 +780,7 @@ static void send_probe(int seq, int ttl, OPacket *op, 
      ip->ip_off = 0;
      ip->ip_hl = sizeof(*ip) >> 2;
      ip->ip_p = IPPROTO_UDP;
 -    ip->ip_len = 0; /* kernel fills this in */
 +    ip->ip_len = sizeof(OPacket);
      ip->ip_ttl = ttl;
      ip->ip_v = IPVERSION;
      ip->ip_id = htons(ident + seq);
-@@ -905,11 +910,7 @@ static HostData *wait_for_reply(HostData *hosts, int n
+@@ -905,11 +911,7 @@ static HostData *wait_for_reply(HostData *hosts, int n
      time_t msec_used;
      HostData *host;
      
 -#if !defined(__GLIBC__)
 -    int fromlen = sizeof(from);
 -#else				/* __GLIBC__ */
      socklen_t fromlen = sizeof(from);
 -#endif				/* __GLIBC__ */
  
      FD_ZERO(&fds);
      FD_SET(sock, &fds);