diff -up rp-pppoe-3.10/man/pppoe.8.than rp-pppoe-3.10/man/pppoe.8
--- rp-pppoe-3.10/man/pppoe.8.than	2016-06-03 15:51:56.587673656 +0200
+++ rp-pppoe-3.10/man/pppoe.8	2016-06-03 16:43:36.171245000 +0200
@@ -32,6 +32,10 @@ triggered.  The best way to do this is t
 PPPoE timeout to be about four times the LCP echo interval.
 
 .TP
+.B \-t \fItimeout\fR
+The \fB\-t\fR option sets the initial timeout for discovery packets in seconds.
+
+.TP
 .B \-D \fIfile_name\fR
 The \fB\-D\fR option causes every packet to be dumped to the specified
 \fIfile_name\fR.  This is intended for debugging only; it produces huge
@@ -140,6 +144,10 @@ the peer you are dealing with uses non-s
 ISP uses non-standard frame types, complain!
 
 .TP
+.B \-F numfloods
+The \fB\-F\fR option sets the discovery flood, only used for stress-testing.
+
+.TP
 .B \-h
 The \fB\-h\fR option causes \fBpppoe\fR to print usage information and
 exit.
diff -up rp-pppoe-3.10/man/pppoe-server.8.than rp-pppoe-3.10/man/pppoe-server.8
--- rp-pppoe-3.10/man/pppoe-server.8.than	2016-06-03 16:46:36.653467414 +0200
+++ rp-pppoe-3.10/man/pppoe-server.8	2016-06-03 17:03:14.838977026 +0200
@@ -58,12 +58,20 @@ PADI and PADR packets are ignored.  If y
 then no limit is imposed on the number of sessions per peer MAC address.
 
 .TP
+.B \-P
+Check pool file for correctness and exit.
+
+.TP
 .B \-s
 This option is passed directly to \fBpppoe\fR; see \fBpppoe\fR(8) for
 details.  In addition, it causes \fBpppd\fR to be invoked with the
 \fIsync\fR option.
 
 .TP
+.B \-l
+Increment local IP address for each session.
+
+.TP
 .B \-L \fIip\fR
 Sets the local IP address.  This is passed to spawned \fBpppd\fR processes.
 If not specified, the default is 10.0.0.1.
@@ -123,6 +131,10 @@ handing out sessions in order, the sessi
 unpredictable order.
 
 .TP
+.B \-d
+Debug session creation.
+
+.TP
 .B \-u
 Tells the server to invoke \fBpppd\fR with the \fIunit\fR option.  Note
 that this option only works for \fBpppd\fR version 2.4.0 or newer.
diff -up rp-pppoe-3.10/src/pppoe.c.than rp-pppoe-3.10/src/pppoe.c
--- rp-pppoe-3.10/src/pppoe.c.than	2016-06-03 15:37:36.009035435 +0200
+++ rp-pppoe-3.10/src/pppoe.c	2016-06-03 16:45:05.547888671 +0200
@@ -379,6 +379,7 @@ usage(char const *argv0)
 	    "   -k             -- Kill a session with PADT (requires -e)\n"
 	    "   -d             -- Perform discovery, print session info and exit.\n"
 	    "   -f disc:sess   -- Set Ethernet frame types (hex).\n"
+	    "   -F numfloods   -- Set the discovery flood, only used for stress-testing.\n"
 	    "   -h             -- Print usage information.\n\n"
 	    "PPPoE Version %s, Copyright (C) 2001-2006 Roaring Penguin Software Inc.\n"
 	    "PPPoE comes with ABSOLUTELY NO WARRANTY.\n"
diff -up rp-pppoe-3.10/src/pppoe-server.c.than rp-pppoe-3.10/src/pppoe-server.c