diff --git a/net/rp-pppoe/patches/100-configure.patch b/net/rp-pppoe/patches/100-configure.patch
index d45593aae..a109c0847 100644
--- a/net/rp-pppoe/patches/100-configure.patch
+++ b/net/rp-pppoe/patches/100-configure.patch
@@ -1,15 +1,15 @@
 --- a/src/configure
 +++ b/src/configure
-@@ -3661,7 +3661,7 @@ done
+@@ -3691,7 +3691,7 @@ done
  
  for ac_header in linux/if.h
  do :
 -  ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" "#include<sys/socket.h>
 +  ac_fn_c_check_header_compile "$LINENO" "linux/if.h" "ac_cv_header_linux_if_h" "#include <sys/socket.h>
  "
- if test "x$ac_cv_header_linux_if_h" = x""yes; then :
+ if test "x$ac_cv_header_linux_if_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
-@@ -3675,10 +3675,11 @@ done
+@@ -3705,10 +3705,11 @@ done
  for ac_header in linux/if_pppox.h
  do :
    ac_fn_c_check_header_compile "$LINENO" "linux/if_pppox.h" "ac_cv_header_linux_if_pppox_h" "
@@ -24,8 +24,8 @@
 +#include <linux/in6.h>
  
  "
- if test "x$ac_cv_header_linux_if_pppox_h" = x""yes; then :
-@@ -4611,7 +4612,7 @@ esac
+ if test "x$ac_cv_header_linux_if_pppox_h" = xyes; then :
+@@ -4644,7 +4645,7 @@ esac
  $as_echo_n "checking packing order of bit fields... " >&6; }
  if test "${rpppoe_cv_pack_bitfields+set}" != set ; then
  if test "$cross_compiling" = yes; then :
diff --git a/net/rp-pppoe/patches/110-Makefile.patch b/net/rp-pppoe/patches/110-Makefile.patch
index 9dc1c72ac..7b63ddb99 100644
--- a/net/rp-pppoe/patches/110-Makefile.patch
+++ b/net/rp-pppoe/patches/110-Makefile.patch
@@ -7,5 +7,5 @@
 -	@CC@ -o $@ @RDYNAMIC@ $^ $(LDFLAGS) $(PPPOE_SERVER_LIBS) -Llibevent -levent
 +	@CC@ -o $@ @RDYNAMIC@ $^ $(LDFLAGS) $(PPPOE_SERVER_LIBS)
  
- pppoe: pppoe.o if.o debug.o common.o ppp.o discovery.o
- 	@CC@ -o $@ $^ $(LDFLAGS)
+ # Experimental code from Savoir Faire Linux.  I do not consider it
+ # production-ready, so not part of the official distribution.
diff --git a/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch b/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
index c9a5f69be..8e9185e2c 100644
--- a/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
+++ b/net/rp-pppoe/patches/120-use-linux-ether-not-netinet.patch
@@ -1,8 +1,6 @@
-Index: rp-pppoe-3.11/src/configure
-===================================================================
---- rp-pppoe-3.11.orig/src/configure	2016-05-21 23:42:58.142423086 -0400
-+++ rp-pppoe-3.11/src/configure	2016-05-21 23:42:58.178423086 -0400
-@@ -3646,7 +3646,7 @@
+--- a/src/configure
++++ b/src/configure
+@@ -3676,7 +3676,7 @@ fi
  done
  
  
@@ -11,11 +9,9 @@ Index: rp-pppoe-3.11/src/configure
  do :
    as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
  ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-Index: rp-pppoe-3.11/src/if.c
-===================================================================
---- rp-pppoe-3.11.orig/src/if.c	2012-08-17 14:31:25.000000000 -0400
-+++ rp-pppoe-3.11/src/if.c	2016-05-21 23:45:13.546423086 -0400
-@@ -30,10 +30,6 @@
+--- a/src/if.c
++++ b/src/if.c
+@@ -30,10 +30,6 @@ static char const RCSID[] =
  #include <linux/if_packet.h>
  #endif
  
@@ -26,11 +22,9 @@ Index: rp-pppoe-3.11/src/if.c
  #ifdef HAVE_ASM_TYPES_H
  #include <asm/types.h>
  #endif
-Index: rp-pppoe-3.11/src/plugin.c
-===================================================================
---- rp-pppoe-3.11.orig/src/plugin.c	2012-08-17 14:31:25.000000000 -0400
-+++ rp-pppoe-3.11/src/plugin.c	2016-05-21 23:43:55.314423086 -0400
-@@ -49,7 +49,6 @@
+--- a/src/plugin.c
++++ b/src/plugin.c
+@@ -49,7 +49,6 @@ static char const RCSID[] =
  #include <unistd.h>
  #include <fcntl.h>
  #include <signal.h>