diff --git a/sbin/route/keywords.c b/sbin/route/keywords.c
index c8c0f49..6877ecf 100644
--- a/sbin/route/keywords.c
+++ b/sbin/route/keywords.c
@@ -28,7 +28,6 @@ struct keytab keywords[] = {
 	{"inet", K_INET},
 	{"inet6", K_INET6},
 	{"link", K_LINK},
-	{"llinfo", K_LLINFO},
 	{"lock", K_LOCK},
 	{"lockrest", K_LOCKREST},
 	{"mask", K_MASK},
diff --git a/sbin/route/keywords.h b/sbin/route/keywords.h
index 5a43925..a0a07dd 100644
--- a/sbin/route/keywords.h
+++ b/sbin/route/keywords.h
@@ -31,7 +31,7 @@ extern struct keytab {
 #define	K_INET	20
 #define	K_INET6	21
 #define	K_LINK	22
-#define	K_LLINFO	23
+/* #define	K_LLINFO	23 */
 #define	K_LOCK	24
 #define	K_LOCKREST	25
 #define	K_MASK	26
diff --git a/sbin/route/route.8 b/sbin/route/route.8
index aa90f9e..d2876d4d 100644
--- a/sbin/route/route.8
+++ b/sbin/route/route.8
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)route.8	8.4 (Berkeley) 6/1/94
 .\"
-.Dd March 19, 2015
+.Dd March 30, 2016
 .Dt ROUTE 8
 .Os
 .Sh NAME
@@ -297,14 +297,15 @@ by indicating the following corresponding modifiers:
 .It Li B Ta -blackhole Ta " RTF_BLACKHOLE" Ta discard pkts (during updates)
 .It Li b Ta "" Ta " RTF_BROADCAST" Ta Route represents a broadcast address
 .It Li " " Ta -noblackhole Ta ~RTF_BLACKHOLE Ta clear blackhole flag
-.It Li C Ta -cloning Ta " RTF_CLONING" Ta  generates a new route on use
-.It Li " " Ta -nocloning Ta ~RTF_CLONING Ta stop generating new routes on use
-.It Li c Ta -cloned Ta " RTF_CLONED" Ta route generated by RTF_CLONING
-.It Li " " Ta -nocloned Ta ~RTF_CLONED Ta deny removal with RTF_CLONING
+.It Li C Ta -cloning Ta " RTF_CLONING" Ta  (deprecated) same as
+.Fl connected
+.It Li " " Ta -nocloning Ta ~RTF_CLONING Ta (deprecated) same as
+.Fl noconnected
+.It Li C Ta -connected Ta " RTF_CONNECTED" Ta  treat as a connected route
+.It Li " " Ta -noconnected Ta ~RTF_CONNECTED Ta stop treating a connected route
 .It Li D Ta "" Ta " RTF_DYNAMIC" Ta created dynamically (redirect)
 .It Li G Ta "" Ta " RTF_GATEWAY" Ta forwarded to dest by intermediary
 .It Li H Ta "" Ta " RTF_HOST" Ta host entry (net otherwise)
-.It Li L Ta -llinfo Ta " RTF_LLINFO" Ta translate proto to link addr
 .It Li l Ta "" Ta " RTF_LOCAL" Ta Route represents a local address
 .It Li M Ta "" Ta " RTF_MODIFIED" Ta modified dynamically (redirect)
 .It Li p Ta -proxy Ta " RTF_ANNOUNCE" Ta make entry a link level proxy
@@ -313,7 +314,6 @@ by indicating the following corresponding modifiers:
 .It Li S Ta -static Ta " RTF_STATIC" Ta manually added route
 .It Li " " Ta -nostatic Ta ~RTF_STATIC Ta pretend route added automatically
 .It Li U Ta "" Ta " RTF_UP" Ta route usable
-.It Li X Ta -xresolve Ta " RTF_XRESOLVE" Ta emit mesg on use (for ext lookup)
 .El
 .Pp
 The optional modifiers
@@ -430,6 +430,24 @@ The
 command appeared in
 .Bx 4.2 .
 IPv6 support was added by WIDE/KAME project.
+.Pp
+Since
+.Nx 8.0 ,
+.Fl cloned ,
+.Fl nocloned ,
+.Fl llinfo
+and
+.Fl xresolve
+were obsolete and
+.Fl cloning
+and
+.Fl nocloning
+were deprecated.
+.Fl connected
+and
+.Fl noconnected
+appeared in
+.Nx 8.0 .
 .Sh BUGS
 The first paragraph may have slightly exaggerated
 .Xr routed 8 Ns 's
diff --git a/share/man/man4/route.4 b/share/man/man4/route.4
index dea24c1..eb9ff79 100644
--- a/share/man/man4/route.4
+++ b/share/man/man4/route.4
@@ -29,7 +29,7 @@
 .\"
 .\"     @(#)route.4	8.6 (Berkeley) 4/19/94
 .\"
-.Dd March 19, 2015
+.Dd March 30, 2016
 .Dt ROUTE 4
 .Os
 .Sh NAME
@@ -196,7 +196,6 @@ The messages are:
 #define	RTM_LOSING	0x5    /* Kernel Suspects Partitioning */
 #define	RTM_REDIRECT	0x6    /* Told to use different route */
 #define	RTM_MISS	0x7    /* Lookup failed on this address */
-#define	RTM_RESOLVE	0xb    /* request to resolve dst to LL addr */
 #define	RTM_NEWADDR	0xc    /* address being added to iface */
 #define	RTM_DELADDR	0xd    /* address being removed from iface */
 #define	RTM_OOIFINFO	0xe    /* Old (pre-1.5) RTM_IFINFO message */
@@ -300,12 +299,10 @@ Flags include the values:
 #define	RTF_MODIFIED  0x20      /* modified dynamically (by redirect) */
 #define	RTF_DONE      0x40      /* message confirmed */
 #define	RTF_MASK      0x80      /* subnet mask present */
-#define	RTF_CLONING   0x100     /* generate new routes on use */
-#define	RTF_XRESOLVE  0x200     /* external daemon resolves name */
-#define	RTF_LLINFO    0x400     /* generated by ARP or NDP */
+#define RTF_CONNECTED 0x100     /* hosts on this route are neighbours */
+#define RTF_LLDATA    0x400     /* used by apps to add/del L2 entries */
 #define	RTF_STATIC    0x800     /* manually added */
 #define	RTF_BLACKHOLE 0x1000    /* just discard pkts (during updates) */
-#define	RTF_CLONED    0x2000    /* this is a cloned route */
 #define	RTF_PROTO2    0x4000    /* protocol specific routing flag */
 #define	RTF_PROTO1    0x8000    /* protocol specific routing flag */
 #define	RTF_SRC       0x10000   /* route has fixed source address */
@@ -352,6 +349,21 @@ Flags for IPv6 addresses:
 #define IN6_IFF_AUTOCONF	0x40	/* autoconfigurable address. */
 #define IN6_IFF_TEMPORARY	0x80	/* temporary (anonymous) address. */
 .Ed
+.Sh HISTORY
+Since
+.Nx 8.0 ,
+.Cm RTF_CLONED ,
+.Cm RTF_CLONING ,
+.Cm RTF_LLINFO ,
+.Cm RTF_XRESOLVE
+and
+.Cm RTM_RESOLVE
+were obsolete.
+.Cm RTF_CONNECTED
+and
+.Cm RTF_LLDATA
+appeared in
+.Nx 8.0 .
 .Sh SEE ALSO
 .Xr socket 2 ,
 .Xr sysctl 3
diff --git a/usr.sbin/arp/arp.4 b/usr.sbin/arp/arp.4
index 08fc0ff..66ce965 100644
--- a/usr.sbin/arp/arp.4
+++ b/usr.sbin/arp/arp.4
@@ -29,7 +29,7 @@
 .\"
 .\"	from: @(#)arp4.4	6.5 (Berkeley) 4/18/94
 .\"
-.Dd April 18, 1994
+.Dd March 30, 2016
 .Dt ARP 4
 .Os
 .Sh NAME
@@ -63,22 +63,10 @@ for a non-responding destination host, and
 .Er EHOSTUNREACH
 for a non-responding router.
 .Pp
-The ARP cache is stored in the system routing table as
-dynamically-created host routes.
-The route to a directly-attached Ethernet network is installed as a
-.Dq cloning
-route (one with the
-.Dv RTF_CLONING
-flag set),
-causing routes to individual hosts on that network to be created on
-demand.
-These routes time out periodically (normally 20 minutes after validated;
+Each ARP cache entry is stored in a network interface which a response
+of ARP comes in.
+ARP cache entires time out periodically (normally 20 minutes after validated;
 entries are not validated when not in use).
-An entry for a host which is not responding is a
-.Dq reject
-route (one with the
-.Dv RTF_REJECT
-flag set).
 .Pp
 ARP entries may be added, deleted or changed with the
 .Xr arp 8
@@ -103,6 +91,10 @@ mapping requests for its own Internet address with a different Ethernet
 address, generally indicating that two hosts are attempting to use the
 same Internet address.
 .El
+.Sh HISTORY
+Since
+.Nx 8.0 ,
+the ARP cache was not stored in the routing table.
 .Sh SEE ALSO
 .Xr inet 4 ,
 .Xr route 4 ,