diff --git a/sys/conf/files b/sys/conf/files
index cd54d31d061f..683b2dac95c9 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.792 2006/07/25 18:04:03 elad Exp $
+#	$NetBSD: files,v 1.793 2006/08/05 17:20:54 pavel Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -161,6 +161,7 @@ defflag	opt_ppp.h		PPP_DEFLATE PPP_BSDCOMP PPP_FILTER
 						# Include deflate or bsd
 						# compression, enable pppd
 						# packet filtering support
+defflag opt_pppoe.h		PPPOE_SERVER PPPOE_TERM_UNKNOWN_SESSIONS
 
 # networking options
 #
diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c
index 80f3da98ace4..c6607fa9adee 100644
--- a/sys/net/if_ethersubr.c
+++ b/sys/net/if_ethersubr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_ethersubr.c,v 1.134 2006/06/07 22:33:42 kardel Exp $	*/
+/*	$NetBSD: if_ethersubr.c,v 1.135 2006/08/05 17:20:54 pavel Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.134 2006/06/07 22:33:42 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.135 2006/08/05 17:20:54 pavel Exp $");
 
 #include "opt_inet.h"
 #include "opt_atalk.h"
@@ -73,6 +73,7 @@ __KERNEL_RCSID(0, "$NetBSD: if_ethersubr.c,v 1.134 2006/06/07 22:33:42 kardel Ex
 #include "opt_ns.h"
 #include "opt_gateway.h"
 #include "opt_pfil_hooks.h"
+#include "opt_pppoe.h"
 #include "vlan.h"
 #include "pppoe.h"
 #include "bridge.h"
diff --git a/sys/net/if_pppoe.c b/sys/net/if_pppoe.c
index c14e89baf59c..57b8a13743f6 100644
--- a/sys/net/if_pppoe.c
+++ b/sys/net/if_pppoe.c
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.70 2006/07/23 22:06:12 ad Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.71 2006/08/05 17:20:54 pavel Exp $ */
 
 /*-
  * Copyright (c) 2002 The NetBSD Foundation, Inc.
@@ -37,11 +37,12 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.70 2006/07/23 22:06:12 ad Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.71 2006/08/05 17:20:54 pavel Exp $");
 
 #include "pppoe.h"
 #include "bpfilter.h"
 #include "opt_pfil_hooks.h"
+#include "opt_pppoe.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>