diff -ur a/openvpn-2.3.6/configure.ac b/openvpn-2.3.6/configure.ac
--- a/openvpn-2.3.6/configure.ac	2014-11-29 17:00:35.000000000 -0200
+++ b/openvpn-2.3.6/configure.ac	2015-05-09 15:42:01.662085785 -0200
@@ -457,7 +457,7 @@
 "
 
 AC_CHECK_HEADERS(
-	[net/if.h netinet/ip.h netinet/if_ether.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h],
+	[net/if.h netinet/ip.h resolv.h sys/un.h net/if_utun.h sys/kern_control.h],
 	,
 	,
 	[[${SOCKET_INCLUDES}]]
diff -ur a/openvpn-2.3.6/src/openvpn/syshead.h b/openvpn-2.3.6/src/openvpn/syshead.h
--- a/openvpn-2.3.6/src/openvpn/syshead.h	2014-11-29 17:00:35.000000000 -0200
+++ b/openvpn-2.3.6/src/openvpn/syshead.h	2015-05-09 15:41:31.579461870 -0200
@@ -214,10 +214,6 @@
 
 #ifdef TARGET_LINUX
 
-#if defined(HAVE_NETINET_IF_ETHER_H)
-#include <netinet/if_ether.h>
-#endif
-
 #ifdef HAVE_LINUX_IF_TUN_H
 #include <linux/if_tun.h>
 #endif
diff -ur a/openvpn-2.3.6/src/openvpn/tun.c b/openvpn-2.3.6/src/openvpn/tun.c
--- a/openvpn-2.3.6/src/openvpn/tun.c	2014-11-29 17:00:35.000000000 -0200
+++ b/openvpn-2.3.6/src/openvpn/tun.c	2015-05-09 15:40:23.499312989 -0200
@@ -1710,9 +1710,9 @@
       pi.flags = 0;
 
       if(iph->version == 6)
-	pi.proto = htons(ETH_P_IPV6);
+	pi.proto = htons(OPENVPN_ETH_P_IPV6);
       else
-	pi.proto = htons(ETH_P_IP);
+	pi.proto = htons(OPENVPN_ETH_P_IPV4);
 
       vect[0].iov_len = sizeof(pi);
       vect[0].iov_base = &pi;