Merge remote-tracking branch 'origin/stable/2.0'

238 files changed, 1609 insertions, 1547 deletions

diff --git a/.gitignore b/.gitignore
index af345e560..546faf692 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,9 +26,8 @@ conftest
 conftest.err
 aclocal.m4
 Makefile.in
-zebra-[0-9.][0-9.][0-9.]*.tar.gz
-quagga-[0-9.][0-9.][0-9.]*.tar.gz
-quagga-[0-9.][0-9.][0-9.]*.tar.gz.asc
+*.tar.gz
+*.tar.gz.asc
 .nfs*
 libtool
 .arch-inventory
diff --git a/COMMUNITY.md b/COMMUNITY.md
index 7d08ed58d..52777da96 100644
--- a/COMMUNITY.md
+++ b/COMMUNITY.md
@@ -300,4 +300,11 @@ at scale and in ways that can be unexpected for the original implementor.
 As such debugs MUST be guarded in such a way that they can be turned off.
 This PROJECT has the ability to turn on/off debugs from the CLI and it is
 expected that the developer will use this convention to allow control
-of their debugs.
\ No newline at end of file
+of their debugs.
+
+### CLI-Changes
+
+CLI's are a complicated ugly beast.  Additions or changes to the CLI
+should use a DEFUN to encapsulate one setting as much as is possible.
+Additionally as new DEFUN's are added to the system, documentation
+should be provided for the new commands.
\ No newline at end of file
diff --git a/INSTALL.quagga.txt b/INSTALL.quagga.txt
deleted file mode 100644
index b414d9486..000000000
--- a/INSTALL.quagga.txt
+++ /dev/null
@@ -1,111 +0,0 @@
---------------------------------------------------------------------------
-Building and Installing Quagga from releases or snapshots:
-
-The 'INSTALL' file contains generic instructions on how to use 'configure'
-scripts.
-
-Quagga requires a C compiler (and associated header files and
-libraries) supporting the C99 standard.
-
-Quagga requires a reasonable make.  It is considered a bug if quagga
-does not compile with the system make on recent FreeBSD, NetBSD or
-OpenBSD, and a very serious bug if it does not compile with GNU make.
-
-Quagga expects a POSIX.2 compliant system, more or less.  Clean
-workarounds for POSIX non-compliance are welcome.
-
-It is considered a bug if Quagga fails to build and run on any of the
-following systems (where .x indicates the most recent release), or
-such systems "-current" versions.  Or, it might be that this list is
-out of date and will be updated.  (Note that considering it a bug is
-not a guarantee of support, merely "we agree that it is broken".)
-
-  Dragonfly ?
-  FreeBSD (stable branches currently supported, plus perhaps one)
-  FreeBSD-current
-  Linux [kernel/distribution information needed]
-  NetBSD 4.x
-  NetBSD 5.x
-  NetBSD 6.x
-  NetBSD-current
-  OpenBSD ? [info needed on what should work]
-  Solaris (modern/supported versions, including OpenSolaris forks) 
-
-On BSD systems, installing libexecinfo is strongly recommended in order
-to get backtrace support.
-
-For further Quagga specific information on 'configure' and build-time
-configuration of the software, please read the Quagga info
-documentation, (doc/quagga.info).  To read the info page included with
-the Quagga sources without first installing Quagga:
-
-  cd doc
-  # one of the following, depending on your info viewer preferences
-  info quagga.info
-  pinfo -r quagga.info
-  emacs -eval '(info "quagga.info")'
-
-The Quagga website (http://www.quagga.net) currently has the info
-files available in various formats.
-
---------------------------------------------------------------------------
-Building Quagga from git checkouts:
-
-In order to build from git, you will need recent versions of several GNU
-tools, particularly autoconf, automake, libtool, GNU awk and texinfo.  Note
-that the CVS snapshots on the Quagga website should not require these tools;
-everything is already setup ready to run 'configure'.  If you have trouble
-building from CVS checkout it is recommended that you try a CVS snapshot
-instead.
-
-We declare that the following versions should work for building from
-CVS checkouts.  Earlier versions may work, but failure to do so is not
-a bug.  Required versions can be moved earlier if no problems, or
-later after a judgement that a system without a higher version is
-deficient is made.
-
-	[TODO: this list is out of date as of 2013-07]
-	automake:	1.9.6 (released 2005-07-10)
-	autoconf:	2.59 (2.60 on 2006-06-26 is too recent to require)
-	libtool:	1.5.22 (released 2005-12-18)
-	texinfo:	4.7 (released 2004-04-10; 4.8 is not yet common)
-
-For running tests, one also needs:
-
-	DejaGnu:
-
-[TODO: texinfo 4.6 is now ancient and this should be revisited/fixed]
-Because some systems provide texinfo 4.6 (4.7 is new), quagga.info is
-checked in so that texinfo will generally not be invoked.  When
-texinfo 4.7 is widespread, quagga.info will be removed from CVS and
-texinfo will become required again.  (4.7 has figure support, needed
-for the route server docs, which is why 4.6 doesn't work.)
-
-In order to create PostScript or PDF versions of the Texinfo documentation,
-you will need the convert utility, from the ImageMagick toolset installed,
-and epstopdf from the TeTeX suite.
-
-To create the required autotools files (Makefile.in, configure, etc.),
-run "./bootstrap.sh".  After this you may run configure as for a
-snapshot or release.
-
-Please refer to "Building and Installing Quagga" above for further
-instructions.
-
---------------------------------------------------------------------------
-Notes on required versions:
-
-The general goal is to use a modern baseline of tools, while not
-imposing pain on those tracking supported (or almost supported) stable
-distributions.  The notes below explain what versions are present in
-various environments.
-
-NetBSD 4 provides texinfo 4.7.
-NetBSD 5 and 6 provides texinfo 4.8
-
-Fedora Core ? provides autoconf 2.59.
-
-OpenBSD 3.6 provides texinfo 4.2.
-OpenBSD [3.6] ports provides automake 1.4-p6 autoconf 2.5.9 libtool 1.5.8
-
---------------------------------------------------------------------------
diff --git a/Makefile.am b/Makefile.am
index 7a2cc29bd..d9b57a5ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,14 +2,14 @@
 
 SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
 	 @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ @LDPD@ \
-         @ISISD@ @PIMD@ @WATCHQUAGGA@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
+         @ISISD@ @PIMD@ @WATCHFRR@ @VTYSH@ @OSPFCLIENT@ @DOC@ m4 @pkgsrcdir@ \
          redhat @SOLARIS@ tests tools cumulus
 
 DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
-	  isisd watchquagga vtysh ospfclient doc m4 pkgsrc redhat tests \
+	  isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
 	  solaris pimd @LIBRFP@ @RFPTEST@ tools cumulus
 
-EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS INSTALL.quagga.txt \
+EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
 	update-autotools \
 	vtysh/Makefile.in vtysh/Makefile.am \
 	tools/rrcheck.pl tools/rrlookup.pl tools/zc.pl \
diff --git a/README b/README
index 91a1d8d0f..447694749 100644
--- a/README
+++ b/README
@@ -3,9 +3,7 @@ protocols.
 
 Currently Quagga supports BGP4, BGP4+, OSPFv2, OSPFv3, RIPv1,
 RIPv2, RIPng, PIM-SSM and LDP as well as very early support for IS-IS.
-  
-See the file INSTALL.quagga.txt for building and installation instructions.
-  
+
 See the file REPORTING-BUGS to report bugs.
-  
+
 Quagga is free software. See the file COPYING for copying conditions.
diff --git a/README.NetBSD b/README.NetBSD
index 6bbc680b9..6e454533e 100755
--- a/README.NetBSD
+++ b/README.NetBSD
@@ -1,7 +1,5 @@
 #!/bin/sh
 
-# $QuaggaId: Format:%an, %ai, %h$ $
-
 # This file is helpful for building quagga from cvs on NetBSD, and
 # probably on any system using pkgsrc.  
 # One should have readline installed already (pkgsrc/devel/readline).
diff --git a/SERVICES b/SERVICES
index c69d0c1a7..ee242ca6a 100644
--- a/SERVICES
+++ b/SERVICES
@@ -18,3 +18,4 @@ ospf6d		2606/tcp
 ospfapi		2607/tcp
 isisd		2608/tcp
 pimd		2611/tcp
+ldpd		2612/tcp
diff --git a/bgpd/bgp_attr.c b/bgpd/bgp_attr.c
index 0cdaa545d..534a0323c 100644
--- a/bgpd/bgp_attr.c
+++ b/bgpd/bgp_attr.c
@@ -221,6 +221,11 @@ cluster_finish (void)
   cluster_hash = NULL;
 }
 
+static struct hash *encap_hash = NULL;
+#if ENABLE_BGP_VNC
+static struct hash *vnc_hash = NULL;
+#endif
+
 struct bgp_attr_encap_subtlv *
 encap_tlv_dup(struct bgp_attr_encap_subtlv *orig)
 {
@@ -288,14 +293,10 @@ encap_same(struct bgp_attr_encap_subtlv *h1, struct bgp_attr_encap_subtlv *h2)
     struct bgp_attr_encap_subtlv *p;
     struct bgp_attr_encap_subtlv *q;
 
-    if (!h1 && !h2)
-	return 1;
-    if (h1 && !h2)
-	return 0;
-    if (!h1 && h2)
-	return 0;
     if (h1 == h2)
 	return 1;
+    if (h1 == NULL || h2 == NULL)
+	return 0;
 
     for (p = h1; p; p = p->next) {
 	for (q = h2; q; q = q->next) {
@@ -326,6 +327,96 @@ encap_same(struct bgp_attr_encap_subtlv *h1, struct bgp_attr_encap_subtlv *h2)
     return 1;
 }
 
+static void *
+encap_hash_alloc (void *p)
+{
+  /* Encap structure is already allocated.  */
+  return p;
+}
+
+typedef enum 
+{
+  ENCAP_SUBTLV_TYPE,
+#if ENABLE_BGP_VNC
+  VNC_SUBTLV_TYPE
+#endif
+} encap_subtlv_type;
+
+static struct bgp_attr_encap_subtlv *
+encap_intern (struct bgp_attr_encap_subtlv *encap, encap_subtlv_type type)
+{
+  struct bgp_attr_encap_subtlv *find;
+  struct hash *hash = encap_hash;
+#if ENABLE_BGP_VNC
+  if (type == VNC_SUBTLV_TYPE)
+    hash = vnc_hash;
+#endif
+
+  find = hash_get (hash, encap, encap_hash_alloc);
+  if (find != encap)
+    encap_free (encap);
+  find->refcnt++;
+
+  return find;
+}
+
+static void
+encap_unintern (struct bgp_attr_encap_subtlv **encapp, encap_subtlv_type type)
+{
+  struct bgp_attr_encap_subtlv *encap = *encapp;
+  if (encap->refcnt)
+    encap->refcnt--;
+
+  if (encap->refcnt == 0)
+    {
+      struct hash *hash = encap_hash;
+#if ENABLE_BGP_VNC
+      if (type == VNC_SUBTLV_TYPE)
+        hash = vnc_hash;
+#endif
+      hash_release (hash, encap);
+      encap_free (encap);
+      *encapp = NULL;
+    }
+}
+
+static unsigned int
+encap_hash_key_make (void *p)
+{
+  const struct bgp_attr_encap_subtlv * encap = p;
+
+  return jhash(encap->value, encap->length, 0);
+}
+
+static int
+encap_hash_cmp (const void *p1, const void *p2)
+{
+  return encap_same((struct bgp_attr_encap_subtlv *)p1,
+                    (struct bgp_attr_encap_subtlv *)p2);
+}
+
+static void
+encap_init (void)
+{
+  encap_hash = hash_create (encap_hash_key_make, encap_hash_cmp);
+#if ENABLE_BGP_VNC
+  vnc_hash = hash_create (encap_hash_key_make, encap_hash_cmp);
+#endif
+}
+
+static void
+encap_finish (void)
+{
+  hash_clean (encap_hash, (void (*)(void *))encap_free);
+  hash_free (encap_hash);
+  encap_hash = NULL;
+#if ENABLE_BGP_VNC
+  hash_clean (vnc_hash, (void (*)(void *))encap_free);
+  hash_free (vnc_hash);
+  vnc_hash = NULL;
+#endif
+}
+
 /* Unknown transit attribute. */
 static struct hash *transit_hash;
 
@@ -434,16 +525,6 @@ bgp_attr_extra_free (struct attr *attr)
 {
   if (attr->extra)
     {
-      if (attr->extra->encap_subtlvs) {
-	encap_free(attr->extra->encap_subtlvs);
-	attr->extra->encap_subtlvs = NULL;
-      }
-#if ENABLE_BGP_VNC
-      if (attr->extra->vnc_subtlvs) {
-	encap_free(attr->extra->vnc_subtlvs);
-	attr->extra->vnc_subtlvs = NULL;
-      }
-#endif
       XFREE (MTYPE_ATTR_EXTRA, attr->extra);
       attr->extra = NULL;
     }
@@ -481,28 +562,12 @@ bgp_attr_dup (struct attr *new, struct attr *orig)
       memset(new->extra, 0, sizeof(struct attr_extra));
       if (orig->extra) {
         *new->extra = *orig->extra;
-        if (orig->extra->encap_subtlvs) {
-          new->extra->encap_subtlvs = encap_tlv_dup(orig->extra->encap_subtlvs);
-        }
-#if ENABLE_BGP_VNC
-      if (orig->extra->vnc_subtlvs) {
-	new->extra->vnc_subtlvs = encap_tlv_dup(orig->extra->vnc_subtlvs);
-      }
-#endif
       }
     }
   else if (orig->extra)
     {
       new->extra = bgp_attr_extra_new();
       *new->extra = *orig->extra;
-      if (orig->extra->encap_subtlvs) {
-	new->extra->encap_subtlvs = encap_tlv_dup(orig->extra->encap_subtlvs);
-      }
-#if ENABLE_BGP_VNC
-      if (orig->extra->vnc_subtlvs) {
-	new->extra->vnc_subtlvs = encap_tlv_dup(orig->extra->vnc_subtlvs);
-      }
-#endif
     }
 }
 
@@ -523,6 +588,12 @@ bgp_attr_deep_dup (struct attr *new, struct attr *orig)
         new->extra->cluster = cluster_dup(orig->extra->cluster);
       if (orig->extra->transit)
         new->extra->transit = transit_dup(orig->extra->transit);
+      if (orig->extra->encap_subtlvs)
+	new->extra->encap_subtlvs = encap_tlv_dup(orig->extra->encap_subtlvs);
+#if ENABLE_BGP_VNC
+      if (orig->extra->vnc_subtlvs)
+	new->extra->vnc_subtlvs = encap_tlv_dup(orig->extra->vnc_subtlvs);
+#endif
     }
 }
 
@@ -543,6 +614,12 @@ bgp_attr_deep_free (struct attr *attr)
         cluster_free(attr->extra->cluster);
       if (attr->extra->transit)
         transit_free(attr->extra->transit);
+      if (attr->extra->encap_subtlvs) 
+	encap_free(attr->extra->encap_subtlvs);
+#if ENABLE_BGP_VNC
+      if (attr->extra->vnc_subtlvs)
+	encap_free(attr->extra->vnc_subtlvs);
+#endif
     }
 }
 
@@ -599,7 +676,12 @@ attrhash_key_make (void *p)
         MIX(cluster_hash_key_make (extra->cluster));
       if (extra->transit)
         MIX(transit_hash_key_make (extra->transit));
-
+      if (extra->encap_subtlvs)
+        MIX(encap_hash_key_make (extra->encap_subtlvs));
+#if ENABLE_BGP_VNC
+      if (extra->vnc_subtlvs)
+        MIX(encap_hash_key_make (extra->vnc_subtlvs));
+#endif
 #ifdef HAVE_IPV6
       MIX(extra->mp_nexthop_len);
       key = jhash(extra->mp_nexthop_global.s6_addr, IPV6_MAX_BYTELEN, key);
@@ -712,13 +794,12 @@ bgp_attr_hash_alloc (void *p)
     {
       attr->extra = bgp_attr_extra_new ();
       *attr->extra = *val->extra;
-
-      if (attr->extra->encap_subtlvs) {
-	attr->extra->encap_subtlvs = encap_tlv_dup(attr->extra->encap_subtlvs);
+      if (val->extra->encap_subtlvs) {
+        val->extra->encap_subtlvs = NULL;
       }
 #if ENABLE_BGP_VNC
-      if (attr->extra->vnc_subtlvs) {
-	attr->extra->vnc_subtlvs = encap_tlv_dup(attr->extra->vnc_subtlvs);
+      if (val->extra->vnc_subtlvs) {
+        val->extra->vnc_subtlvs = NULL;
       }
 #endif
     }
@@ -773,11 +854,27 @@ bgp_attr_intern (struct attr *attr)
           else
             attre->transit->refcnt++;
         }
+      if (attre->encap_subtlvs)
+        {
+          if (! attre->encap_subtlvs->refcnt)
+            attre->encap_subtlvs = encap_intern (attre->encap_subtlvs, ENCAP_SUBTLV_TYPE);
+          else
+            attre->encap_subtlvs->refcnt++;
+        }
+#if ENABLE_BGP_VNC
+      if (attre->vnc_subtlvs)
+        {
+          if (! attre->vnc_subtlvs->refcnt)
+            attre->vnc_subtlvs = encap_intern (attre->vnc_subtlvs, VNC_SUBTLV_TYPE);
+          else
+            attre->vnc_subtlvs->refcnt++;
+        }
+#endif
     }
   
   find = (struct attr *) hash_get (attrhash, attr, bgp_attr_hash_alloc);
   find->refcnt++;
-  
+
   return find;
 }
 
@@ -811,6 +908,14 @@ bgp_attr_refcount (struct attr *attr)
 
       if (attre->transit)
 	attre->transit->refcnt++;
+
+      if (attre->encap_subtlvs)
+	attre->encap_subtlvs->refcnt++;
+
+#if ENABLE_BGP_VNC
+      if (attre->vnc_subtlvs)
+	attre->vnc_subtlvs->refcnt++;
+#endif
     }
   attr->refcnt++;
   return attr;
@@ -936,6 +1041,14 @@ bgp_attr_unintern_sub (struct attr *attr)
       
       if (attr->extra->transit)
         transit_unintern (attr->extra->transit);
+
+      if (attr->extra->encap_subtlvs)
+        encap_unintern (&attr->extra->encap_subtlvs, ENCAP_SUBTLV_TYPE);
+
+#if ENABLE_BGP_VNC
+      if (attr->extra->vnc_subtlvs)
+        encap_unintern (&attr->extra->vnc_subtlvs, VNC_SUBTLV_TYPE);
+#endif
     }
 }
 
@@ -1001,11 +1114,17 @@ bgp_attr_flush (struct attr *attr)
           transit_free (attre->transit);
           attre->transit = NULL;
         }
-      encap_free(attre->encap_subtlvs);
-      attre->encap_subtlvs = NULL;
+      if (attre->encap_subtlvs && ! attre->encap_subtlvs->refcnt)
+        {
+          encap_free(attre->encap_subtlvs);
+          attre->encap_subtlvs = NULL;
+        }
 #if ENABLE_BGP_VNC
-      encap_free(attre->vnc_subtlvs);
-      attre->vnc_subtlvs = NULL;
+      if (attre->vnc_subtlvs && ! attre->vnc_subtlvs->refcnt)
+        {
+          encap_free(attre->vnc_subtlvs);
+          attre->vnc_subtlvs = NULL;
+        }
 #endif
     }
 }
@@ -2493,10 +2612,18 @@ bgp_attr_parse (struct peer *peer, struct attr *attr, bgp_size_t size,
       if (ret != BGP_ATTR_PARSE_PROCEED)
 	return ret;
     }
-
-  /* Finally intern unknown attribute. */
-  if (attr->extra && attr->extra->transit)
-    attr->extra->transit = transit_intern (attr->extra->transit);
+  if (attr->extra) 
+    {
+      /* Finally intern unknown attribute. */
+      if (attr->extra->transit)
+        attr->extra->transit = transit_intern (attr->extra->transit);
+      if (attr->extra->encap_subtlvs)
+        attr->extra->encap_subtlvs = encap_intern (attr->extra->encap_subtlvs, ENCAP_SUBTLV_TYPE);
+#if ENABLE_BGP_VNC
+      if (attr->extra->vnc_subtlvs)
+        attr->extra->vnc_subtlvs = encap_intern (attr->extra->vnc_subtlvs, VNC_SUBTLV_TYPE);
+#endif
+    }
 
   return BGP_ATTR_PARSE_PROCEED;
 }
@@ -3184,6 +3311,7 @@ bgp_attr_init (void)
   ecommunity_init ();
   cluster_init ();
   transit_init ();
+  encap_init ();
 }
 
 void
@@ -3195,6 +3323,7 @@ bgp_attr_finish (void)
   ecommunity_finish ();
   cluster_finish ();
   transit_finish ();
+  encap_finish ();
 }
 
 /* Make attribute packet. */
diff --git a/bgpd/bgp_attr.h b/bgpd/bgp_attr.h
index d4f45ba60..6e639078d 100644
--- a/bgpd/bgp_attr.h
+++ b/bgpd/bgp_attr.h
@@ -58,6 +58,8 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 struct bgp_attr_encap_subtlv {
     struct bgp_attr_encap_subtlv	*next;		/* for chaining */
+    /* Reference count of this attribute. */
+    unsigned long refcnt;
     uint16_t				type;
     uint16_t				length;
     uint8_t				value[1];	/* will be extended */
diff --git a/bgpd/bgp_btoa.c b/bgpd/bgp_btoa.c
index cd52c94b1..37bef9b85 100644
--- a/bgpd/bgp_btoa.c
+++ b/bgpd/bgp_btoa.c
@@ -44,9 +44,9 @@ static zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t bgpd_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
diff --git a/bgpd/bgp_ecommunity.c b/bgpd/bgp_ecommunity.c
index 9138c7280..b65af9e1f 100644
--- a/bgpd/bgp_ecommunity.c
+++ b/bgpd/bgp_ecommunity.c
@@ -54,6 +54,13 @@ ecommunity_free (struct ecommunity **ecom)
   ecom = NULL;
 }
 
+static void 
+ecommunity_hash_free (struct ecommunity *ecom)
+{
+  ecommunity_free(&ecom);
+}
+
+
 /* Add a new Extended Communities value to Extended Communities
    Attribute structure.  When the value is already exists in the
    structure, we don't add the value.  Newly added value is sorted by
@@ -282,6 +289,7 @@ ecommunity_init (void)
 void
 ecommunity_finish (void)
 {
+  hash_clean (ecomhash, (void (*)(void *))ecommunity_hash_free);
   hash_free (ecomhash);
   ecomhash = NULL;
 }
diff --git a/bgpd/bgp_encap.c b/bgpd/bgp_encap.c
index 4ea2f9cde..37e916638 100644
--- a/bgpd/bgp_encap.c
+++ b/bgpd/bgp_encap.c
@@ -467,7 +467,7 @@ bgp_show_encap (
         vty_out (vty, "No prefixes displayed, %ld exist%s", total_count, VTY_NEWLINE);
     }
   else
-    vty_out (vty, "%sDisplayed %ld out of %ld total prefixes%s",
+    vty_out (vty, "%sDisplayed %ld routes and %ld total paths%s",
 	     VTY_NEWLINE, output_count, total_count, VTY_NEWLINE);
 
   return CMD_SUCCESS;
diff --git a/bgpd/bgp_main.c b/bgpd/bgp_main.c
index 91eacc932..33191f0a9 100644
--- a/bgpd/bgp_main.c
+++ b/bgpd/bgp_main.c
@@ -134,9 +134,9 @@ static zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t bgpd_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -174,7 +174,7 @@ redistribution between different routing protocols.\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
 
   exit (status);
@@ -547,7 +547,7 @@ main (int argc, char **argv)
   vty_serv_sock (vty_addr, vty_port, BGP_VTYSH_PATH);
 
   /* Print banner. */
-  zlog_notice ("BGPd %s starting: vty@%d, bgp@%s:%d", QUAGGA_VERSION,
+  zlog_notice ("BGPd %s starting: vty@%d, bgp@%s:%d", FRR_COPYRIGHT,
 	       vty_port, 
 	       (bm->address ? bm->address : "<all>"),
 	       bm->port);
diff --git a/bgpd/bgp_mpath.c b/bgpd/bgp_mpath.c
index e7272cc0a..c9af8419f 100644
--- a/bgpd/bgp_mpath.c
+++ b/bgpd/bgp_mpath.c
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * BGP Multipath
  * Copyright (C) 2010 Google Inc.
  *
diff --git a/bgpd/bgp_mpath.h b/bgpd/bgp_mpath.h
index 0a51c98d0..9a38b5943 100644
--- a/bgpd/bgp_mpath.h
+++ b/bgpd/bgp_mpath.h
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * BGP Multipath
  * Copyright (C) 2010 Google Inc.
  *
diff --git a/bgpd/bgp_mplsvpn.c b/bgpd/bgp_mplsvpn.c
index c64c69dfc..49fb3e394 100644
--- a/bgpd/bgp_mplsvpn.c
+++ b/bgpd/bgp_mplsvpn.c
@@ -888,7 +888,7 @@ bgp_show_mpls_vpn (struct vty *vty, afi_t afi, struct prefix_rd *prd,
       if (output_count == 0)
 	vty_out (vty, "No prefixes displayed, %ld exist%s", total_count, VTY_NEWLINE);
       else
-	vty_out (vty, "%sDisplayed %ld out of %ld total prefixes%s",
+	vty_out (vty, "%sDisplayed %ld routes and %ld total paths%s",
 		 VTY_NEWLINE, output_count, total_count, VTY_NEWLINE);
     }
 
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c
index 1e9aa4bb2..e40c1fe25 100644
--- a/bgpd/bgp_route.c
+++ b/bgpd/bgp_route.c
@@ -630,8 +630,9 @@ bgp_info_cmp (struct bgp *bgp, struct bgp_info *new, struct bgp_info *exist,
     {
       if (peer_sort (new->peer) == BGP_PEER_IBGP
 	  && peer_sort (exist->peer) == BGP_PEER_IBGP
-	  && CHECK_FLAG (mpath_cfg->ibgp_flags,
-			 BGP_FLAG_IBGP_MULTIPATH_SAME_CLUSTERLEN))
+	  && (mpath_cfg == NULL ||
+              CHECK_FLAG (mpath_cfg->ibgp_flags,
+                          BGP_FLAG_IBGP_MULTIPATH_SAME_CLUSTERLEN)))
 	{
 	  newm = BGP_CLUSTER_LIST_LENGTH(new->attr);
 	  existm = BGP_CLUSTER_LIST_LENGTH(exist->attr);
@@ -867,9 +868,8 @@ bgp_info_cmp_compatible (struct bgp *bgp, struct bgp_info *new, struct bgp_info
                          afi_t afi, safi_t safi)
 {
   int paths_eq;
-  struct bgp_maxpaths_cfg mpath_cfg;
   int ret;
-  ret = bgp_info_cmp (bgp, new, exist, &paths_eq, &mpath_cfg, 0, __func__);
+  ret = bgp_info_cmp (bgp, new, exist, &paths_eq, NULL, 0, __func__);
 
   if (paths_eq)
     ret = 0;
@@ -1799,6 +1799,7 @@ subgroup_process_announce_selected (struct update_subgroup *subgrp,
 			      PEER_STATUS_ORF_WAIT_REFRESH))
     return 0;
 
+  memset(&extra, 0, sizeof(struct attr_extra));
   /* It's initialized in bgp_announce_check() */
   attr.extra = &extra;
 
@@ -4498,7 +4499,6 @@ bgp_config_write_table_map (struct vty *vty, struct bgp *bgp, afi_t afi,
   return 0;
 }
 
-
 DEFUN (bgp_table_map,
        bgp_table_map_cmd,
        "table-map WORD",
@@ -7506,7 +7506,7 @@ bgp_show_table (struct vty *vty, struct bgp *bgp, struct bgp_table *table,
             vty_out (vty, "No BGP prefixes displayed, %ld exist%s", total_count, VTY_NEWLINE);
         }
       else
-        vty_out (vty, "%sDisplayed  %ld out of %ld total prefixes%s",
+        vty_out (vty, "%sDisplayed  %ld routes and %ld total paths%s",
                  VTY_NEWLINE, output_count, total_count, VTY_NEWLINE);
     }
 
@@ -7860,7 +7860,7 @@ bgp_show_route (struct vty *vty, const char *view_name, const char *ip_str,
 /* BGP route print out function. */
 DEFUN (show_ip_bgp_ipv4,
        show_ip_bgp_ipv4_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>]\
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]]\
           [<\
              cidr-only\
              |dampening <flap-statistics|dampened-paths|parameters>\
@@ -7880,12 +7880,12 @@ DEFUN (show_ip_bgp_ipv4,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
-       "Address Family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family modifier\n"
        "Display only routes with non-natural netmasks\n"
        "Display detailed information about dampening\n"
@@ -7930,7 +7930,7 @@ DEFUN (show_ip_bgp_ipv4,
   {
     afi = strmatch(argv[idx]->text, "ipv6") ? AFI_IP6 : AFI_IP;
     if (argv_find (argv, argc, "unicast", &idx) || argv_find (argv, argc, "multicast", &idx))
-      safi = strmatch (argv[idx]->text, "unicast") ? SAFI_UNICAST : SAFI_MULTICAST;
+      safi = bgp_vty_safi_from_arg (argv[idx]->text);
   }
   else if (argv_find (argv, argc, "encap", &idx) || argv_find (argv, argc, "vpnv4", &idx))
   {
@@ -8007,7 +8007,7 @@ DEFUN (show_ip_bgp_ipv4,
 
 DEFUN (show_ip_bgp_route,
        show_ip_bgp_route_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>]"
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]]"
        "<A.B.C.D|A.B.C.D/M|X:X::X:X|X:X::X:X/M> [<bestpath|multipath>] [json]",
        SHOW_STR
        IP_STR
@@ -8016,12 +8016,12 @@ DEFUN (show_ip_bgp_route,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
-       "Address Family\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family modifier\n"
        "Network in the BGP routing table to display\n"
        "IPv4 prefix\n"
@@ -8096,16 +8096,20 @@ DEFUN (show_ip_bgp_route,
 
 DEFUN (show_ip_bgp_regexp,
        show_ip_bgp_regexp_cmd,
-       "show [ip] bgp [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] regexp REGEX...",
+       "show [ip] bgp [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]|encap [unicast]|vpnv4 [unicast]>] regexp REGEX...",
        SHOW_STR
        IP_STR
        BGP_STR
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family\n"
diff --git a/bgpd/bgp_updgrp_adv.c b/bgpd/bgp_updgrp_adv.c
index 9a103de91..df154d976 100644
--- a/bgpd/bgp_updgrp_adv.c
+++ b/bgpd/bgp_updgrp_adv.c
@@ -573,8 +573,9 @@ subgroup_clear_table (struct update_subgroup *subgrp)
 
   SUBGRP_FOREACH_ADJ_SAFE (subgrp, aout, taout)
   {
-    bgp_adj_out_remove_subgroup (aout->rn, aout, subgrp);
-    bgp_unlock_node (aout->rn);
+    struct bgp_node *rn = aout->rn;
+    bgp_adj_out_remove_subgroup (rn, aout, subgrp);
+    bgp_unlock_node (rn);
   }
 }
 
diff --git a/bgpd/bgp_vty.c b/bgpd/bgp_vty.c
index 1c2cc037f..c691d20a8 100644
--- a/bgpd/bgp_vty.c
+++ b/bgpd/bgp_vty.c
@@ -123,25 +123,29 @@ bgp_parse_afi(const char *str, afi_t *afi)
     return -1;
 }
 
+/* supports (unicast|multicast|vpn|encap) */
+safi_t
+bgp_vty_safi_from_arg(const char *safi_str)
+{
+  safi_t safi = SAFI_MAX;       /* unknown */
+  if (strncmp (safi_str, "m", 1) == 0)
+    safi = SAFI_MULTICAST;
+  else if (strncmp (safi_str, "u", 1) == 0)
+    safi = SAFI_UNICAST;
+  else if (strncmp (safi_str, "e", 1) == 0)
+    safi = SAFI_ENCAP;
+  else if (strncmp (safi_str, "v", 1) == 0)
+   safi = SAFI_MPLS_VPN;
+  return safi;
+}
+
 int
 bgp_parse_safi(const char *str, safi_t *safi)
 {
-    if (!strcmp(str, "encap")) {
-	*safi = SAFI_ENCAP;
-	return 0;
-    }
-    if (!strcmp(str, "multicast")) {
-	*safi =  SAFI_MULTICAST;
-	return 0;
-    }
-    if (!strcmp(str, "unicast")) {
-	*safi =  SAFI_UNICAST;
-	return 0;
-    }
-    if (!strcmp(str, "vpn")) {
-	*safi =  SAFI_MPLS_VPN;
-	return 0;
-    }
+  *safi = bgp_vty_safi_from_arg(str);
+  if (*safi != SAFI_MAX)
+    return 0;
+  else
     return -1;
 }
 
@@ -5411,17 +5415,31 @@ DEFUN (address_family_ipv4,
 
 DEFUN (address_family_ipv4_safi,
        address_family_ipv4_safi_cmd,
-       "address-family ipv4 <unicast|multicast>",
+       "address-family ipv4 <unicast|multicast|vpn|encap>",
        "Enter Address Family command mode\n"
        "Address Family\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family modifier\n")
 {
   int idx_safi = 2;
-  if (strncmp (argv[idx_safi]->arg, "m", 1) == 0)
-    vty->node = BGP_IPV4M_NODE;
-  else
-    vty->node = BGP_IPV4_NODE;
+  switch (bgp_vty_safi_from_arg(argv[idx_safi]->arg))
+    {
+    case SAFI_MULTICAST:
+      vty->node = BGP_IPV4M_NODE;
+      break;
+    case SAFI_ENCAP:
+      vty->node = BGP_ENCAP_NODE;
+      break;
+    case SAFI_MPLS_VPN:
+      vty->node = BGP_VPNV4_NODE;
+      break;
+    case SAFI_UNICAST:
+    default:
+      vty->node = BGP_IPV4_NODE;
+      break;
+    }
 
   return CMD_SUCCESS;
 }
@@ -5438,10 +5456,12 @@ DEFUN (address_family_ipv6,
 
 DEFUN (address_family_ipv6_safi,
        address_family_ipv6_safi_cmd,
-       "address-family ipv6 <unicast|multicast>",
+       "address-family ipv6 <unicast|multicast|vpn|encap>",
        "Enter Address Family command mode\n"
        "Address Family\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family modifier\n")
 {
   int idx_safi = 2;
@@ -5598,7 +5618,7 @@ bgp_clear_prefix (struct vty *vty, const char *view_name, const char *ip_str,
 /* one clear bgp command to rule them all */
 DEFUN (clear_ip_bgp_all,
        clear_ip_bgp_all_cmd,
-       "clear [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] <*|A.B.C.D|X:X::X:X|WORD|(1-4294967295)|external|peer-group WORD> [<soft [<in|out>]|in [prefix-filter]|out>]",
+       "clear [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]] <*|A.B.C.D|X:X::X:X|WORD|(1-4294967295)|external|peer-group WORD> [<soft [<in|out>]|in [prefix-filter]|out>]",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -5614,9 +5634,13 @@ DEFUN (clear_ip_bgp_all,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family\n"
@@ -5702,12 +5726,12 @@ DEFUN (clear_ip_bgp_all,
     {
       afi = strmatch(argv[idx]->text, "ipv6") ? AFI_IP6 : AFI_IP;
       if (argv_find (argv, argc, "unicast", &idx) || argv_find (argv, argc, "multicast", &idx))
-        safi = strmatch (argv[idx]->text, "unicast") ? SAFI_UNICAST : SAFI_MULTICAST;
+        safi = bgp_vty_safi_from_arg (argv[idx]->text);
     }
   else if (argv_find (argv, argc, "encap", &idx) || argv_find (argv, argc, "vpnv4", &idx))
     {
       afi = AFI_IP;
-      safi = strmatch (argv[idx]->text, "encap") ? SAFI_ENCAP : SAFI_MPLS_VPN;
+      safi = bgp_vty_safi_from_arg (argv[idx]->text);
       // advance idx if necessary
       argv_find (argv, argc, "unicast", &idx);
     }
@@ -5759,27 +5783,27 @@ DEFUN (clear_ip_bgp_prefix,
 
 DEFUN (clear_bgp_ipv6_safi_prefix,
        clear_bgp_ipv6_safi_prefix_cmd,
-       "clear [ip] bgp ipv6 <unicast|multicast> prefix X:X::X:X/M",
+       "clear [ip] bgp ipv6 <unicast|multicast|vpn|encap> prefix X:X::X:X/M",
        CLEAR_STR
        IP_STR
        BGP_STR
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Clear bestpath and re-advertise\n"
        "IPv6 prefix\n")
 {
   int idx_safi = 3;
   int idx_ipv6_prefixlen = 5;
-  if (strncmp (argv[idx_safi]->arg, "m", 1) == 0)
-    return bgp_clear_prefix (vty, NULL, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, SAFI_MULTICAST, NULL);
-  else
-    return bgp_clear_prefix (vty, NULL, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, SAFI_UNICAST, NULL);
+  safi_t safi = bgp_vty_safi_from_arg (argv[idx_safi]->arg);
+  return bgp_clear_prefix (vty, NULL, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, safi, NULL);
 }
 
 DEFUN (clear_bgp_instance_ipv6_safi_prefix,
        clear_bgp_instance_ipv6_safi_prefix_cmd,
-       "clear [ip] bgp <view|vrf> WORD ipv6 <unicast|multicast> prefix X:X::X:X/M",
+       "clear [ip] bgp <view|vrf> WORD ipv6 <unicast|multicast|vpn|encap> prefix X:X::X:X/M",
        CLEAR_STR
        IP_STR
        BGP_STR
@@ -5787,16 +5811,16 @@ DEFUN (clear_bgp_instance_ipv6_safi_prefix,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Clear bestpath and re-advertise\n"
        "IPv6 prefix\n")
 {
   int idx_word = 3;
   int idx_safi = 5;
   int idx_ipv6_prefixlen = 7;
-  if (strncmp (argv[idx_safi]->arg, "m", 1) == 0)
-    return bgp_clear_prefix (vty, argv[idx_word]->arg, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, SAFI_MULTICAST, NULL);
-  else
-    return bgp_clear_prefix (vty, argv[idx_word]->arg, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, SAFI_UNICAST, NULL);
+  safi_t safi = bgp_vty_safi_from_arg (argv[idx_safi]->text);
+  return bgp_clear_prefix (vty, argv[idx_word]->arg, argv[idx_ipv6_prefixlen]->arg, AFI_IP6, safi, NULL);
 }
 
 DEFUN (show_bgp_views,
@@ -6118,6 +6142,10 @@ bgp_show_summary (struct vty *vty, struct bgp *bgp, int afi, int safi,
 
           if (peer->afc[afi][safi])
 	    {
+	      memset(dn_flag, '\0', sizeof(dn_flag));
+	      if (peer_dynamic_neighbor(peer))
+		dn_flag[0] = '*';
+
 	      if (peer->hostname && bgp_flag_check(bgp, BGP_FLAG_SHOW_HOSTNAME))
 		sprintf(neighbor_buf, "%s%s(%s) ", dn_flag, peer->hostname, peer->host);
 	      else
@@ -6513,7 +6541,7 @@ bgp_show_summary_vty (struct vty *vty, const char *name,
 /* `show [ip] bgp summary' commands. */
 DEFUN (show_ip_bgp_summary,
        show_ip_bgp_summary_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 <all|rd ASN:nn_or_IP-address:nn>>] summary [json]",
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]|vpnv4 <all|rd ASN:nn_or_IP-address:nn>>] summary [json]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -6521,11 +6549,13 @@ DEFUN (show_ip_bgp_summary,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family\n"
        "Display information about all VPNv4 NLRIs\n"
        "Display information for a route distinguisher\n"
@@ -6550,7 +6580,7 @@ DEFUN (show_ip_bgp_summary,
   {
     afi = strmatch(argv[idx]->text, "ipv6") ? AFI_IP6 : AFI_IP;
     if (argv_find (argv, argc, "unicast", &idx) || argv_find (argv, argc, "multicast", &idx))
-      safi = strmatch (argv[idx]->text, "unicast") ? SAFI_UNICAST : SAFI_MULTICAST;
+      safi = bgp_vty_safi_from_arg (argv[idx]->text);
   }
   else if (argv_find (argv, argc, "encap", &idx))
   {
@@ -8452,12 +8482,14 @@ DEFUN (show_ip_bgp_neighbors,
    same.*/
 DEFUN (show_ip_bgp_paths,
        show_ip_bgp_paths_cmd,
-       "show [ip] bgp [<unicast|multicast>] paths",
+       "show [ip] bgp [<unicast|multicast|vpn|encap>] paths",
        SHOW_STR
        IP_STR
        BGP_STR
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Path information\n")
 {
   vty_out (vty, "Address Refcnt Path%s", VTY_NEWLINE);
@@ -8555,7 +8587,7 @@ bgp_show_update_groups(struct vty *vty, const char *name,
 
 DEFUN (show_ip_bgp_updgrps,
        show_ip_bgp_updgrps_cmd,
-       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast>]|ipv6 [<unicast|multicast>]|encap [unicast]|vpnv4 [unicast]>] update-groups [SUBGROUP-ID]",
+       "show [ip] bgp [<view|vrf> WORD] [<ipv4 [<unicast|multicast|vpn|encap>]|ipv6 [<unicast|multicast|vpn|encap>]|vpnv4 [unicast]>] update-groups [SUBGROUP-ID]",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8563,11 +8595,13 @@ DEFUN (show_ip_bgp_updgrps,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
-       "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Address Family\n"
        "Address Family modifier\n"
        "Detailed info about dynamic update groups\n"
@@ -8591,12 +8625,12 @@ DEFUN (show_ip_bgp_updgrps,
   {
     afi = strmatch(argv[idx]->text, "ipv6") ? AFI_IP6 : AFI_IP;
     if (argv_find (argv, argc, "unicast", &idx) || argv_find (argv, argc, "multicast", &idx))
-      safi = strmatch (argv[idx]->text, "unicast") ? SAFI_UNICAST : SAFI_MULTICAST;
+      safi = bgp_vty_safi_from_arg (argv[idx]->text);
   }
   else if (argv_find (argv, argc, "encap", &idx) || argv_find (argv, argc, "vpnv4", &idx))
   {
     afi = AFI_IP;
-    safi = strmatch (argv[idx]->text, "encap") ? SAFI_ENCAP : SAFI_MPLS_VPN;
+    safi = bgp_vty_safi_from_arg (argv[idx]->text);
     // advance idx if necessary
     argv_find (argv, argc, "unicast", &idx);
   }
@@ -8721,7 +8755,7 @@ DEFUN (show_ip_bgp_instance_updgrps_adj,
 
 DEFUN (show_bgp_updgrps_afi_adj,
        show_bgp_updgrps_afi_adj_cmd,
-       "show [ip] bgp <ipv4|ipv6> <unicast|multicast> update-groups <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp <ipv4|ipv6> <unicast|multicast|vpn|encap> update-groups <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8729,6 +8763,8 @@ DEFUN (show_bgp_updgrps_afi_adj,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Detailed info about dynamic update groups\n"
        "Advertisement queue\n"
        "Announced routes\n"
@@ -8742,7 +8778,7 @@ DEFUN (show_bgp_updgrps_afi_adj,
   safi_t safi;
 
   afi = (strcmp(argv[idx_afi]->arg, "ipv4") == 0) ? AFI_IP : AFI_IP6;
-  safi = (strncmp (argv[idx_safi]->arg, "m", 1) == 0) ? SAFI_MULTICAST : SAFI_UNICAST;
+  safi = bgp_vty_safi_from_arg(argv[idx_safi]->arg);
   show_bgp_updgrps_adj_info_aux(vty, NULL, afi, safi, argv[idx_type]->arg, 0);
   return CMD_SUCCESS;
 }
@@ -8831,7 +8867,7 @@ DEFUN (show_ip_bgp_instance_updgrps_adj_s,
 
 DEFUN (show_bgp_updgrps_afi_adj_s,
        show_bgp_updgrps_afi_adj_s_cmd,
-       "show [ip] bgp <ipv4|ipv6> <unicast|multicast> update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
+       "show [ip] bgp <ipv4|ipv6> <unicast|multicast|vpn|encap> update-groups SUBGROUP-ID <advertise-queue|advertised-routes|packet-queue>",
        SHOW_STR
        IP_STR
        BGP_STR
@@ -8839,6 +8875,8 @@ DEFUN (show_bgp_updgrps_afi_adj_s,
        "Address Family\n"
        "Address Family modifier\n"
        "Address Family modifier\n"
+       "Address Family modifier\n"
+       "Address Family modifier\n"
        "Detailed info about dynamic update groups\n"
        "Specific subgroup to display info for\n"
        "Advertisement queue\n"
@@ -8855,7 +8893,7 @@ DEFUN (show_bgp_updgrps_afi_adj_s,
   uint64_t subgrp_id;
 
   afi = (strmatch(argv[idx_afi]->text, "ipv4")) ? AFI_IP : AFI_IP6;
-  safi = (strmatch(argv[idx_safi]->text, "unicast")) ? SAFI_UNICAST : SAFI_MULTICAST;
+  safi = bgp_vty_safi_from_arg(argv[idx_safi]->text);
   VTY_GET_ULL("subgroup-id", subgrp_id, argv[idx_subgroup_id]->arg);
 
   show_bgp_updgrps_adj_info_aux(vty, NULL, afi, safi, argv[idx_type]->arg, subgrp_id);
@@ -9098,7 +9136,7 @@ DEFUN (bgp_redistribute_ipv4,
        bgp_redistribute_ipv4_cmd,
        "redistribute <kernel|connected|static|rip|ospf|isis|pim|table>",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD)
+       FRR_IP_REDIST_HELP_STR_BGPD)
 {
   VTY_DECLVAR_CONTEXT(bgp, bgp);
   int idx_protocol = 1;
@@ -9118,7 +9156,7 @@ DEFUN (bgp_redistribute_ipv4_rmap,
        bgp_redistribute_ipv4_rmap_cmd,
        "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
+       FRR_IP_REDIST_HELP_STR_BGPD
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
@@ -9144,7 +9182,7 @@ DEFUN (bgp_redistribute_ipv4_metric,
        bgp_redistribute_ipv4_metric_cmd,
        "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
+       FRR_IP_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
        "Default metric\n")
 {
@@ -9172,7 +9210,7 @@ DEFUN (bgp_redistribute_ipv4_rmap_metric,
        bgp_redistribute_ipv4_rmap_metric_cmd,
        "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> route-map WORD metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
+       FRR_IP_REDIST_HELP_STR_BGPD
        "Route map reference\n"
        "Pointer to route-map entries\n"
        "Metric for redistributed routes\n"
@@ -9204,7 +9242,7 @@ DEFUN (bgp_redistribute_ipv4_metric_rmap,
        bgp_redistribute_ipv4_metric_rmap_cmd,
        "redistribute <kernel|connected|static|rip|ospf|isis|pim|table> metric (0-4294967295) route-map WORD",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
+       FRR_IP_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
        "Default metric\n"
        "Route map reference\n"
@@ -9423,7 +9461,7 @@ DEFUN (no_bgp_redistribute_ipv4,
        "no redistribute <kernel|connected|static|rip|ospf|isis|pim|table> [metric (0-4294967295)] [route-map WORD]",
        NO_STR
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP_REDIST_HELP_STR_BGPD
+       FRR_IP_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
        "Default metric\n"
        "Route map reference\n"
@@ -9447,7 +9485,7 @@ DEFUN (bgp_redistribute_ipv6,
        bgp_redistribute_ipv6_cmd,
        "redistribute <kernel|connected|static|ripng|ospf6|isis|table>",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD)
+       FRR_IP6_REDIST_HELP_STR_BGPD)
 {
   VTY_DECLVAR_CONTEXT(bgp, bgp);
   int idx_protocol = 1;
@@ -9468,7 +9506,7 @@ DEFUN (bgp_redistribute_ipv6_rmap,
        bgp_redistribute_ipv6_rmap_cmd,
        "redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
+       FRR_IP6_REDIST_HELP_STR_BGPD
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
@@ -9494,7 +9532,7 @@ DEFUN (bgp_redistribute_ipv6_metric,
        bgp_redistribute_ipv6_metric_cmd,
        "redistribute <kernel|connected|static|ripng|ospf6|isis|table> metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
+       FRR_IP6_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
        "Default metric\n")
 {
@@ -9522,7 +9560,7 @@ DEFUN (bgp_redistribute_ipv6_rmap_metric,
        bgp_redistribute_ipv6_rmap_metric_cmd,
        "redistribute <kernel|connected|static|ripng|ospf6|isis|table> route-map WORD metric (0-4294967295)",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
+       FRR_IP6_REDIST_HELP_STR_BGPD
        "Route map reference\n"
        "Pointer to route-map entries\n"
        "Metric for redistributed routes\n"
@@ -9554,7 +9592,7 @@ DEFUN (bgp_redistribute_ipv6_metric_rmap,
        bgp_redistribute_ipv6_metric_rmap_cmd,
        "redistribute <kernel|connected|static|ripng|ospf6|isis|table> metric (0-4294967295) route-map WORD",
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
+       FRR_IP6_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
        "Default metric\n"
        "Route map reference\n"
@@ -9587,7 +9625,7 @@ DEFUN (no_bgp_redistribute_ipv6,
        "no redistribute <kernel|connected|static|ripng|ospf6|isis|table> [metric (0-4294967295)] [route-map WORD]",
        NO_STR
        "Redistribute information from another routing protocol\n"
-       QUAGGA_IP6_REDIST_HELP_STR_BGPD
+       FRR_IP6_REDIST_HELP_STR_BGPD
        "Metric for redistributed routes\n"
        "Default metric\n"
        "Route map reference\n"
@@ -9606,10 +9644,6 @@ DEFUN (no_bgp_redistribute_ipv6,
 
   return bgp_redistribute_unset (bgp, AFI_IP6, type, 0);
 }
-
-
-
-
 #endif /* HAVE_IPV6 */
 
 int
diff --git a/bgpd/bgp_vty.h b/bgpd/bgp_vty.h
index 382af0984..51b728066 100644
--- a/bgpd/bgp_vty.h
+++ b/bgpd/bgp_vty.h
@@ -26,6 +26,13 @@ struct bgp;
 #define BGP_INSTANCE_HELP_STR "BGP view\nBGP VRF\nView/VRF name\n"
 #define BGP_INSTANCE_ALL_HELP_STR "BGP view\nBGP VRF\nAll Views/VRFs\n"
 
+#define AFI_SAFI_STR \
+  "Address family\n" \
+  "Address Family modifier\n" \
+  "Address Family modifier\n" \
+  "Address Family modifier\n" \
+  "Address Family modifier\n"
+
 extern void bgp_vty_init (void);
 extern const char *afi_safi_print (afi_t, safi_t);
 extern int bgp_config_write_update_delay (struct vty *, struct bgp *);
@@ -42,4 +49,7 @@ bgp_parse_afi(const char *str, afi_t *afi);
 extern int
 bgp_parse_safi(const char *str, safi_t *safi);
 
+extern safi_t
+bgp_vty_safi_from_arg(const char *safi_str);
+
 #endif /* _QUAGGA_BGP_VTY_H */
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.c b/bgpd/rfapi/bgp_rfapi_cfg.c
index b6c162eb1..faa35503b 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.c
+++ b/bgpd/rfapi/bgp_rfapi_cfg.c
@@ -3497,7 +3497,7 @@ static struct cmd_node bgp_vnc_l2_group_node = {
   1
 };
 
-static struct rfapi_l2_group_cfg *
+struct rfapi_l2_group_cfg *
 bgp_rfapi_get_group_by_lni_label (
   struct bgp	*bgp,
   uint32_t	logical_net_id,
diff --git a/bgpd/rfapi/bgp_rfapi_cfg.h b/bgpd/rfapi/bgp_rfapi_cfg.h
index 50ab3e27a..897b4be76 100644
--- a/bgpd/rfapi/bgp_rfapi_cfg.h
+++ b/bgpd/rfapi/bgp_rfapi_cfg.h
@@ -300,6 +300,12 @@ bgp_rfapi_show_summary (struct bgp *bgp, struct vty *vty);
 extern struct rfapi_cfg *
 bgp_rfapi_get_config (struct bgp *bgp);
 
+extern struct rfapi_l2_group_cfg *
+bgp_rfapi_get_group_by_lni_label (
+  struct bgp	*bgp,
+  uint32_t	logical_net_id,
+  uint32_t	label);
+
 extern struct ecommunity *
 bgp_rfapi_get_ecommunity_by_lni_label (
   struct bgp	*bgp,
diff --git a/bgpd/rfapi/rfapi.c b/bgpd/rfapi/rfapi.c
index e74b370f4..248ba7a63 100644
--- a/bgpd/rfapi/rfapi.c
+++ b/bgpd/rfapi/rfapi.c
@@ -2842,13 +2842,39 @@ rfapi_register (
                * If mac address is set, add an RT based on the registered LNI
                */
               memset ((char *) &ecom_value, 0, sizeof (ecom_value));
-              ecom_value.val[1] = 0x02;
+              ecom_value.val[1] = ECOMMUNITY_ROUTE_TARGET;
               ecom_value.val[5] = (l2o->logical_net_id >> 16) & 0xff;
               ecom_value.val[6] = (l2o->logical_net_id >> 8) & 0xff;
               ecom_value.val[7] = (l2o->logical_net_id >> 0) & 0xff;
               rtlist = ecommunity_new();
               ecommunity_add_val (rtlist, &ecom_value);
             }
+          if (l2o->tag_id) 
+            {
+              as_t as      = bgp->as;
+              uint16_t val = l2o->tag_id;
+              memset ((char *) &ecom_value, 0, sizeof (ecom_value));
+              ecom_value.val[1] = ECOMMUNITY_ROUTE_TARGET;
+              if (as > BGP_AS_MAX)
+                {      
+                  ecom_value.val[0] = ECOMMUNITY_ENCODE_AS4;
+                  ecom_value.val[2] = (as >>24) & 0xff;
+                  ecom_value.val[3] = (as >>16) & 0xff;
+                  ecom_value.val[4] = (as >>8) & 0xff;
+                  ecom_value.val[5] =  as & 0xff;
+                }
+              else
+                {
+                  ecom_value.val[0] = ECOMMUNITY_ENCODE_AS;
+                  ecom_value.val[2] = (as >>8) & 0xff;
+                  ecom_value.val[3] = as & 0xff;
+                }
+              ecom_value.val[6] = (val >> 8) & 0xff;
+              ecom_value.val[7] = val & 0xff;
+              if (rtlist == NULL)
+                rtlist = ecommunity_new();
+              ecommunity_add_val (rtlist, &ecom_value);
+            }
         }
 
       /*
diff --git a/bgpd/rfapi/rfapi.h b/bgpd/rfapi/rfapi.h
index 7d108432a..420c6e0d7 100644
--- a/bgpd/rfapi/rfapi.h
+++ b/bgpd/rfapi/rfapi.h
@@ -89,6 +89,7 @@ struct rfapi_l2address_option
   uint32_t		logical_net_id;	/* ~= EVPN Ethernet Segment Id,
                                    must not be zero for mac regis. */
   uint8_t		local_nve_id;
+  uint16_t		tag_id;         /* EVPN Ethernet Tag ID, 0 = none */
 };
 
 typedef enum
diff --git a/bgpd/rfapi/rfapi_import.c b/bgpd/rfapi/rfapi_import.c
index 0b46702bb..25c05e65f 100644
--- a/bgpd/rfapi/rfapi_import.c
+++ b/bgpd/rfapi/rfapi_import.c
@@ -1130,6 +1130,49 @@ rfapiEcommunityGetLNI (struct ecommunity *ecom, uint32_t * lni)
   return ENOENT;
 }
 
+int
+rfapiEcommunityGetEthernetTag (struct ecommunity *ecom, uint16_t * tag_id)
+{
+  struct bgp *bgp = bgp_get_default ();
+  *tag_id = 0;                  /* default to untagged */
+  if (ecom)
+    {
+      int i;
+      for (i = 0; i < ecom->size; ++i)
+        {
+          as_t as    = 0;
+          int encode = 0;
+          uint8_t *p = ecom->val + (i * ECOMMUNITY_SIZE);
+          
+          /* High-order octet of type. */
+          encode = *p++;
+
+          if (*p++ == ECOMMUNITY_ROUTE_TARGET) {
+            if (encode == ECOMMUNITY_ENCODE_AS4)
+              {
+                as =  (*p++ << 24);
+                as |= (*p++ << 16);
+                as |= (*p++ << 8);
+                as |= (*p++);
+              } 
+            else if (encode == ECOMMUNITY_ENCODE_AS)
+              {
+                as =  (*p++ << 8);
+                as |= (*p++);
+                p += 2;         /* skip next two, tag/vid always in lowest bytes */
+              }
+            if (as == bgp->as) 
+              {
+                *tag_id  = *p++ << 8;
+                *tag_id |= (*p++);
+                return 0;
+              }
+          }
+        }
+    }
+  return ENOENT;
+}
+
 static int
 rfapiVpnBiNhEqualsPt (struct bgp_info *bi, struct rfapi_ip_addr *hpt)
 {
@@ -1377,6 +1420,8 @@ rfapiRouteInfo2NextHopEntry (
         {
           (void) rfapiEcommunityGetLNI (bi->attr->extra->ecommunity,
                                         &vo->v.l2addr.logical_net_id);
+          (void) rfapiEcommunityGetEthernetTag (bi->attr->extra->ecommunity,
+                                                &vo->v.l2addr.tag_id);
         }
 
       /* local_nve_id comes from lower byte of RD type */
@@ -2106,6 +2151,7 @@ rfapiBgpInfoAttachSorted (
   info_new->next = next;
   if (next)
     next->prev = info_new;
+  bgp_attr_intern (info_new->attr);
 }
 
 static void
@@ -2114,6 +2160,7 @@ rfapiBgpInfoDetach (struct route_node *rn, struct bgp_info *bi)
   /*
    * Remove the route (doubly-linked)
    */
+  //  bgp_attr_unintern (&bi->attr);
   if (bi->next)
     bi->next->prev = bi->prev;
   if (bi->prev)
@@ -2464,6 +2511,7 @@ rfapiMonitorEncapAdd (
      __func__, import_table, vpn_bi, afi, rn, m);
 
   RFAPI_CHECK_REFCOUNT (rn, SAFI_ENCAP, 0);
+  bgp_attr_intern (vpn_bi->attr);
 }
 
 static void
@@ -2966,6 +3014,7 @@ rfapiBiStartWithdrawTimer (
   wcb->node = rn;
   wcb->info = bi;
   wcb->import_table = import_table;
+  bgp_attr_intern (bi->attr);
 
   if (VNC_DEBUG(VERBOSE))
     {
diff --git a/bgpd/rfapi/rfapi_import.h b/bgpd/rfapi/rfapi_import.h
index 3a1ae3573..3cf55462a 100644
--- a/bgpd/rfapi/rfapi_import.h
+++ b/bgpd/rfapi/rfapi_import.h
@@ -203,6 +203,9 @@ extern int rfapiEcommunityGetLNI (
   struct ecommunity	*ecom,
   uint32_t		*lni);
 
+extern int rfapiEcommunityGetEthernetTag (
+  struct ecommunity *ecom,
+  uint16_t * tag_id);
 
 /* enable for debugging; disable for performance */
 #if 0
diff --git a/bgpd/rfapi/rfapi_rib.c b/bgpd/rfapi/rfapi_rib.c
index daedbeede..6aae35e63 100644
--- a/bgpd/rfapi/rfapi_rib.c
+++ b/bgpd/rfapi/rfapi_rib.c
@@ -707,6 +707,8 @@ rfapiRibBi2Ri(
         {
           (void) rfapiEcommunityGetLNI (bi->attr->extra->ecommunity,
                                         &vo->v.l2addr.logical_net_id);
+          (void) rfapiEcommunityGetEthernetTag (bi->attr->extra->ecommunity,
+                                                &vo->v.l2addr.tag_id);
         }
 
       /* local_nve_id comes from RD */
diff --git a/bgpd/rfapi/rfapi_vty.c b/bgpd/rfapi/rfapi_vty.c
index add18ecbf..0b729ba30 100644
--- a/bgpd/rfapi/rfapi_vty.c
+++ b/bgpd/rfapi/rfapi_vty.c
@@ -2553,7 +2553,7 @@ DEFUN (add_vnc_prefix_cost_life_lnh,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295) .LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2579,7 +2579,7 @@ DEFUN (add_vnc_prefix_life_cost_lnh,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) cost (0-255) .LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2605,7 +2605,7 @@ DEFUN (add_vnc_prefix_cost_lnh,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) .LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2629,7 +2629,7 @@ DEFUN (add_vnc_prefix_life_lnh,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) .LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2653,7 +2653,7 @@ DEFUN (add_vnc_prefix_lnh,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> .LNH_OPTIONS",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2678,7 +2678,7 @@ DEFUN (add_vnc_prefix_cost_life,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2704,7 +2704,7 @@ DEFUN (add_vnc_prefix_life_cost,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295) cost (0-255)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2730,7 +2730,7 @@ DEFUN (add_vnc_prefix_cost,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2754,7 +2754,7 @@ DEFUN (add_vnc_prefix_life,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2778,7 +2778,7 @@ DEFUN (add_vnc_prefix,
        "add vnc prefix <A.B.C.D/M|X:X::X:X/M> vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "VN address of NVE\n"
@@ -2803,7 +2803,7 @@ DEFUN (add_vnc_mac_vni_prefix_cost_life,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> cost (0-255) lifetime (1-4294967295)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2813,7 +2813,7 @@ DEFUN (add_vnc_mac_vni_prefix_cost_life,
        "UN address of NVE\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "Administrative cost   [default: 255]\n"
@@ -2833,7 +2833,7 @@ DEFUN (add_vnc_mac_vni_prefix_life,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> lifetime (1-4294967295)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2843,7 +2843,7 @@ DEFUN (add_vnc_mac_vni_prefix_life,
        "UN address of NVE\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "Registration lifetime [default: infinite]\n"
@@ -2860,7 +2860,7 @@ DEFUN (add_vnc_mac_vni_prefix_cost,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M> cost (0-255)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2870,7 +2870,7 @@ DEFUN (add_vnc_mac_vni_prefix_cost,
        "UN address of NVE\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
        "Administrative cost   [default: 255]\n" "Administrative cost\n")
@@ -2886,7 +2886,7 @@ DEFUN (add_vnc_mac_vni_prefix,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> prefix <A.B.C.D/M|X:X::X:X/M>",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2896,7 +2896,7 @@ DEFUN (add_vnc_mac_vni_prefix,
        "UN address of NVE\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
-       "Add/modify prefix related infomation\n"
+       "Add/modify prefix related information\n"
        "IPv4 prefix\n" "IPv6 prefix\n")
 {
   /*                       pfx      vn       un       cost     life */
@@ -2910,7 +2910,7 @@ DEFUN (add_vnc_mac_vni_cost_life,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255) lifetime (1-4294967295)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2937,7 +2937,7 @@ DEFUN (add_vnc_mac_vni_cost,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> cost (0-255)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2961,7 +2961,7 @@ DEFUN (add_vnc_mac_vni_life,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X> lifetime (1-4294967295)",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -2986,7 +2986,7 @@ DEFUN (add_vnc_mac_vni,
        "add vnc mac YY:YY:YY:YY:YY:YY virtual-network-identifier (1-4294967295) vn <A.B.C.D|X:X::X:X> un <A.B.C.D|X:X::X:X>",
        "Add registration\n"
        "VNC Information\n"
-       "Add/modify mac address infomation\n"
+       "Add/modify mac address information\n"
        "MAC address\n"
        "Virtual Network Identifier follows\n"
        "Virtual Network Identifier\n"
@@ -3735,7 +3735,7 @@ DEFUN (clear_vnc_nve_vn_un,
        "clear vnc nve vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "VN address of NVE\n"
        "VN IPv4 interface address\n"
        "VN IPv6 interface address\n"
@@ -3765,7 +3765,7 @@ DEFUN (clear_vnc_nve_un_vn,
        "clear vnc nve un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "UN address of NVE\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
@@ -3795,7 +3795,7 @@ DEFUN (clear_vnc_nve_vn,
        "clear vnc nve vn <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "VN address of NVE\n"
        "VN IPv4 interface address\n" "VN IPv6 interface address\n")
 {
@@ -3820,7 +3820,7 @@ DEFUN (clear_vnc_nve_un,
        "clear vnc nve un <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "UN address of NVE\n"
        "UN IPv4 interface address\n" "UN IPv6 interface address\n")
 {
@@ -3853,7 +3853,7 @@ DEFUN (clear_vnc_prefix_vn_un,
        "clear vnc prefix <*|A.B.C.D/M|X:X::X:X/M> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "All prefixes\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
@@ -3883,7 +3883,7 @@ DEFUN (clear_vnc_prefix_un_vn,
        "clear vnc prefix <*|A.B.C.D/M|X:X::X:X/M> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "All prefixes\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
@@ -3913,7 +3913,7 @@ DEFUN (clear_vnc_prefix_un,
        "clear vnc prefix <*|A.B.C.D/M|X:X::X:X/M> un <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "All prefixes\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
@@ -3939,7 +3939,7 @@ DEFUN (clear_vnc_prefix_vn,
        "clear vnc prefix <*|A.B.C.D/M|X:X::X:X/M> vn <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "All prefixes\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
@@ -3965,7 +3965,7 @@ DEFUN (clear_vnc_prefix_all,
        "clear vnc prefix <*|A.B.C.D/M|X:X::X:X/M> *",
        "clear\n"
        "VNC Information\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "All prefixes\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n"
@@ -3995,7 +3995,7 @@ DEFUN (clear_vnc_mac_vn_un,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4030,7 +4030,7 @@ DEFUN (clear_vnc_mac_un_vn,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4064,7 +4064,7 @@ DEFUN (clear_vnc_mac_un,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4093,7 +4093,7 @@ DEFUN (clear_vnc_mac_vn,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4122,7 +4122,7 @@ DEFUN (clear_vnc_mac_all,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> *",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4152,7 +4152,7 @@ DEFUN (clear_vnc_mac_vn_un_prefix,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> un <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4167,7 +4167,7 @@ DEFUN (clear_vnc_mac_vn_un_prefix,
        "All UN addresses\n"
        "UN IPv4 interface address\n"
        "UN IPv6 interface address\n"
-       "Clear prefix registration infomation\n"
+       "Clear prefix registration information\n"
        "All prefixes\n"
        "IPv4 prefix\n"
        "IPv6 prefix\n")
@@ -4191,7 +4191,7 @@ DEFUN (clear_vnc_mac_un_vn_prefix,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> vn <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M> prefix <*|A.B.C.D/M|X:X::X:X/M>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4225,7 +4225,7 @@ DEFUN (clear_vnc_mac_un_prefix,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> un <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4255,7 +4255,7 @@ DEFUN (clear_vnc_mac_vn_prefix,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> vn <*|A.B.C.D|X:X::X:X> prefix <*|A.B.C.D/M|X:X::X:X/M>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
@@ -4285,7 +4285,7 @@ DEFUN (clear_vnc_mac_all_prefix,
        "clear vnc mac <*|YY:YY:YY:YY:YY:YY> virtual-network-identifier <*|(1-4294967295)> prefix <*|A.B.C.D/M|X:X::X:X/M>",
        "clear\n"
        "VNC Information\n"
-       "Clear mac registration infomation\n"
+       "Clear mac registration information\n"
        "All macs\n"
        "MAC address\n"
        "VNI keyword\n"
diff --git a/bgpd/rfapi/vnc_export_bgp.c b/bgpd/rfapi/vnc_export_bgp.c
index bcfa145c6..f20e9ed67 100644
--- a/bgpd/rfapi/vnc_export_bgp.c
+++ b/bgpd/rfapi/vnc_export_bgp.c
@@ -76,7 +76,6 @@ encap_attr_export_ce (
   memset (new, 0, sizeof (struct attr));
   bgp_attr_dup (new, orig);
   bgp_attr_extra_get (new);
-  bgp_attr_flush_encap (new);
 
   /*
    * Set nexthop
diff --git a/bgpd/rfp-example/rfptest/.gitignore b/bgpd/rfp-example/rfptest/.gitignore
new file mode 100644
index 000000000..d3d7c0a16
--- /dev/null
+++ b/bgpd/rfp-example/rfptest/.gitignore
@@ -0,0 +1 @@
+/rfptest
diff --git a/configure.ac b/configure.ac
index 40eab0a9a..3b589a5fa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 ##
-## Configure template file for Quagga.
+## Configure template file for FreeRangeRouting.
 ## autoconf will generate configure script.
 ##
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
@@ -7,9 +7,14 @@
 ##
 AC_PREREQ(2.60)
 
-AC_INIT(Quagga, 2.0.999, [https://bugzilla.quagga.net])
+AC_INIT(frr, 2.0-rc0, [https://bugzilla.quagga.net])
+PACKAGE_URL="https://freerangerouting.org/"
+PACKAGE_FULLNAME="FreeRangeRouting"
+AC_SUBST(PACKAGE_FULLNAME)
+
 CONFIG_ARGS="$ac_configure_args"
 AC_SUBST(CONFIG_ARGS)
+
 AC_CONFIG_SRCDIR(lib/zebra.h)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -208,8 +213,8 @@ AC_ARG_ENABLE(ospf6d,
   AS_HELP_STRING([--disable-ospf6d], [do not build ospf6d]))
 AC_ARG_ENABLE(ldpd,
   AS_HELP_STRING([--enable-ldpd], [build ldpd]))
-AC_ARG_ENABLE(watchquagga,
-  AS_HELP_STRING([--disable-watchquagga], [do not build watchquagga]))
+AC_ARG_ENABLE(watchfrr,
+  AS_HELP_STRING([--disable-watchfrr], [do not build watchfrr]))
 AC_ARG_ENABLE(isisd,
   AS_HELP_STRING([--disable-isisd], [do not build isisd]))
 AC_ARG_ENABLE(pimd,
@@ -234,9 +239,9 @@ AC_ARG_ENABLE(ospfclient,
 AC_ARG_ENABLE(multipath,
   AS_HELP_STRING([--enable-multipath=ARG], [enable multipath function, ARG must be digit]))
 AC_ARG_ENABLE(user,
-  AS_HELP_STRING([--enable-user=USER], [user to run Quagga suite as (default quagga)]))
+  AS_HELP_STRING([--enable-user=USER], [user to run FRR suite as (default frr)]))
 AC_ARG_ENABLE(group,
-  AS_HELP_STRING([--enable-group=GROUP], [group to run Quagga suite as (default quagga)]))
+  AS_HELP_STRING([--enable-group=GROUP], [group to run FRR suite as (default frr)]))
 AC_ARG_ENABLE(vty_group,
   AS_HELP_STRING([--enable-vty-group=ARG], [set vty sockets to have specified group as owner]))
 AC_ARG_ENABLE(configfile_mask,
@@ -422,18 +427,18 @@ if test x"${enable_user}" = x"no"; then
   enable_user=""
 else
   if test x"${enable_user}" = x"yes" || test x"${enable_user}" = x""; then
-    enable_user="quagga"
+    enable_user="frr"
   fi
-  AC_DEFINE_UNQUOTED(QUAGGA_USER, "${enable_user}", Quagga User)
+  AC_DEFINE_UNQUOTED(FRR_USER, "${enable_user}", frr User)
 fi
 
 if test x"${enable_group}" = x"no"; then
   enable_group=""
 else
   if test x"${enable_group}" = x"yes" || test x"${enable_group}" = x""; then
-    enable_group="quagga"
+    enable_group="frr"
   fi
-  AC_DEFINE_UNQUOTED(QUAGGA_GROUP, "${enable_group}", Quagga Group)
+  AC_DEFINE_UNQUOTED(FRR_GROUP, "${enable_group}", frr Group)
 fi
 
 if test x"${enable_vty_group}" = x"yes" ; then
@@ -511,7 +516,7 @@ AC_CHECK_HEADERS([stropts.h sys/ksym.h \
 	sys/cdefs.h])
 
 dnl Utility macro to avoid retyping includes all the time
-m4_define([QUAGGA_INCLUDES],
+m4_define([FRR_INCLUDES],
 [#ifdef SUNOS_5
 #define _XPG4_2
 #define __EXTENSIONS__
@@ -538,10 +543,10 @@ dnl Same applies for HAVE_NET_IF_VAR_H, which HAVE_NETINET6_ND6_H and
 dnl HAVE_NETINET_IN_VAR_H depend upon. But if_var.h depends on if.h, hence
 dnl an additional round for it.
 
-AC_CHECK_HEADERS([net/if_var.h], [], [], QUAGGA_INCLUDES)
+AC_CHECK_HEADERS([net/if_var.h], [], [], FRR_INCLUDES)
 
-m4_define([QUAGGA_INCLUDES],
-QUAGGA_INCLUDES
+m4_define([FRR_INCLUDES],
+FRR_INCLUDES
 [#if HAVE_NET_IF_VAR_H
 # include <net/if_var.h>
 #endif
@@ -551,13 +556,13 @@ AC_CHECK_HEADERS([netinet/in_var.h \
 	net/if_dl.h net/netopt.h \
 	inet/nd.h netinet/ip_icmp.h \
 	sys/sysctl.h sys/sockio.h kvm.h sys/conf.h],
-	[], [], QUAGGA_INCLUDES)
+	[], [], FRR_INCLUDES)
 
 AC_CHECK_HEADERS([ucontext.h], [], [],
 [#ifndef __USE_GNU
 #define __USE_GNU
 #endif /* __USE_GNU */
-QUAGGA_INCLUDES
+FRR_INCLUDES
 ])
 
 m4_define([UCONTEXT_INCLUDES],
@@ -572,8 +577,8 @@ AC_CHECK_MEMBERS([ucontext_t.uc_mcontext.regs],
 AC_CHECK_MEMBERS([ucontext_t.uc_mcontext.gregs],
   [], [], [UCONTEXT_INCLUDES])
 
-m4_define([QUAGGA_INCLUDES],
-QUAGGA_INCLUDES
+m4_define([FRR_INCLUDES],
+FRR_INCLUDES
 [
 #include <sys/un.h>
 #include <netinet/in_systm.h>
@@ -701,13 +706,13 @@ if test "$with_libpam" = "yes"; then
      AC_DEFINE(PAM_CONV_FUNC,misc_conv,Have misc_conv)
      pam_conv_func="misc_conv"
     ],
-    [], QUAGGA_INCLUDES)
+    [], FRR_INCLUDES)
   AC_CHECK_HEADER([security/openpam.h],
     [AC_DEFINE(HAVE_OPENPAM_H,,Have openpam.h)
      AC_DEFINE(PAM_CONV_FUNC,openpam_ttyconv,Have openpam_ttyconv)
      pam_conv_func="openpam_ttyconv"
     ],
-    [], QUAGGA_INCLUDES[#include <security/pam_appl.h>])
+    [], FRR_INCLUDES[#include <security/pam_appl.h>])
   if test -z "$ac_cv_header_security_pam_misc_h$ac_cv_header_security_openpam_h" ; then
     AC_MSG_WARN([*** pam support will not be built ***])
     with_libpam="no"
@@ -795,7 +800,7 @@ AC_CHECK_FUNCS([ \
 AC_CHECK_HEADER([asm-generic/unistd.h],
                 [AC_CHECK_DECL(__NR_setns,
                                AC_DEFINE(HAVE_NETNS,, Have netns),,
-                               QUAGGA_INCLUDES [#include <asm-generic/unistd.h>
+                               FRR_INCLUDES [#include <asm-generic/unistd.h>
                                ])
                  AC_CHECK_FUNCS(setns)]
                )
@@ -882,25 +887,25 @@ main()
 dnl ------------------------------
 dnl check kernel route read method
 dnl ------------------------------
-AC_CACHE_CHECK([route read method], [quagga_cv_rtread_method],
+AC_CACHE_CHECK([route read method], [frr_cv_rtread_method],
 [if test "x$netlink" = xyes; then
-  quagga_cv_rtread_method="netlink"
+  frr_cv_rtread_method="netlink"
 else
-for quagga_cv_rtread_method in /dev/ip /dev/null;
+for frr_cv_rtread_method in /dev/ip /dev/null;
 do
-  test x`ls $quagga_cv_rtread_method 2>/dev/null` = x"$quagga_cv_rtread_method" && break
+  test x`ls $frr_cv_rtread_method 2>/dev/null` = x"$frr_cv_rtread_method" && break
 done
-case $quagga_cv_rtread_method in
+case $frr_cv_rtread_method in
   "/dev/ip")
                      case "$host" in
-                       *-freebsd*)    quagga_cv_rtread_method="sysctl";;
-                       *)             quagga_cv_rtread_method="getmsg";;
+                       *-freebsd*)    frr_cv_rtread_method="sysctl";;
+                       *)             frr_cv_rtread_method="getmsg";;
                      esac;;
 	*)
-                     quagga_cv_rtread_method="sysctl";;
+                     frr_cv_rtread_method="sysctl";;
 esac
 fi])
-RTREAD_METHOD=rtread_${quagga_cv_rtread_method}.o
+RTREAD_METHOD=rtread_${frr_cv_rtread_method}.o
 AC_SUBST(RTREAD_METHOD)
 
 dnl -----------------------------
@@ -935,7 +940,7 @@ AC_SUBST(IOCTL_METHOD)
 dnl ---------------------------------------------------------------
 dnl figure out how to specify an interface in multicast sockets API
 dnl ---------------------------------------------------------------
-AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], QUAGGA_INCLUDES)
+AC_CHECK_MEMBERS([struct ip_mreqn.imr_ifindex], [], [], FRR_INCLUDES)
 
 AC_CHECK_HEADERS([linux/mroute.h], [], [],[
 	#include <sys/socket.h>
@@ -944,8 +949,8 @@ AC_CHECK_HEADERS([linux/mroute.h], [], [],[
 	#include <linux/types.h>
 ])
 
-m4_define([QUAGGA_INCLUDES],
-QUAGGA_INCLUDES
+m4_define([FRR_INCLUDES],
+FRR_INCLUDES
 [#if HAVE_LINUX_MROUTE_H
 # include <linux/mroute.h>
 #endif
@@ -958,8 +963,8 @@ AC_CHECK_HEADERS([netinet/ip_mroute.h], [], [],[
 	#include <net/route.h>
 ])
 
-m4_define([QUAGGA_INCLUDES],
-QUAGGA_INCLUDES
+m4_define([FRR_INCLUDES],
+FRR_INCLUDES
 [#if HAVE_NETINET_IP_MROUTE_H
 # include <netinet/ip_mroute.h>
 #endif
@@ -989,14 +994,14 @@ dnl figure out how to check link-state
 dnl ---------------------------------------------------------------
 AC_CHECK_HEADER( [net/if_media.h],
   [m4_define([LINK_DETECT_INCLUDES],
-    QUAGGA_INCLUDES
+    FRR_INCLUDES
     [#include <net/if_media.h>
   ])
   AC_CHECK_MEMBERS( [struct ifmediareq.ifm_status],
     AC_DEFINE(HAVE_BSD_LINK_DETECT,,[BSD link-detect]),
     [], LINK_DETECT_INCLUDES)], 
   [],
-  QUAGGA_INCLUDES)
+  FRR_INCLUDES)
 
 dnl ---------------------------------------------------------------
 dnl Additional, newer way to check link-state using ifi_link_state.
@@ -1004,7 +1009,7 @@ dnl Not available in all BSD's when ifmediareq available
 dnl ---------------------------------------------------------------
 AC_CHECK_MEMBERS([struct if_data.ifi_link_state],
   AC_DEFINE(HAVE_BSD_IFI_LINK_STATE,,[BSD ifi_link_state available]),
-  [], QUAGGA_INCLUDES)
+  [], FRR_INCLUDES)
 
 dnl ------------------------
 dnl TCP_MD5SIG socket option
@@ -1012,16 +1017,16 @@ dnl ------------------------
 
 AC_CHECK_HEADER([netinet/tcp.h], 
    [m4_define([MD5_INCLUDES],
-      QUAGGA_INCLUDES
+      FRR_INCLUDES
       [#include <netinet/tcp.h>
     ])
     AC_CHECK_DECLS([TCP_MD5SIG], [], [], MD5_INCLUDES)],
    [],
-   QUAGGA_INCLUDES)
+   FRR_INCLUDES)
 if test $ac_cv_have_decl_TCP_MD5SIG = no; then
   AC_CHECK_HEADER([linux/tcp.h],
        [m4_define([MD5_INCLUDES],
-          QUAGGA_INCLUDES
+          FRR_INCLUDES
           [#include <linux/tcp.h>
         ])
        AC_CHECK_DECLS([TCP_MD5SIG], [], [], MD5_INCLUDES)])
@@ -1030,29 +1035,29 @@ fi
 dnl -----------------------------
 dnl check ipforward detect method
 dnl -----------------------------
-AC_CACHE_CHECK([ipforward method], [quagga_cv_ipforward_method],
+AC_CACHE_CHECK([ipforward method], [frr_cv_ipforward_method],
 [if test x$cross_compiling = xyes; then
   if test x"$opsys" = x"gnu-linux"; then
-    quagga_cv_ipforward_method=/proc/net/snmp
+    frr_cv_ipforward_method=/proc/net/snmp
   else
-    quagga_cv_ipforward_method=/dev/ip
+    frr_cv_ipforward_method=/dev/ip
   fi
 else
-  for quagga_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null;
+  for frr_cv_ipforward_method in /proc/net/snmp /dev/ip /dev/null;
   do
-    test x`ls $quagga_cv_ipforward_method 2>/dev/null` = x"$quagga_cv_ipforward_method" && break
+    test x`ls $frr_cv_ipforward_method 2>/dev/null` = x"$frr_cv_ipforward_method" && break
   done
 fi
-case $quagga_cv_ipforward_method in
-  "/proc/net/snmp")  quagga_cv_ipforward_method="proc";;
+case $frr_cv_ipforward_method in
+  "/proc/net/snmp")  frr_cv_ipforward_method="proc";;
   "/dev/ip")         
                      case "$host" in
-                       *-freebsd*)    quagga_cv_ipforward_method="sysctl";;
-                       *)             quagga_cv_ipforward_method="solaris";;
+                       *-freebsd*)    frr_cv_ipforward_method="sysctl";;
+                       *)             frr_cv_ipforward_method="solaris";;
                      esac;;
-  *)                 quagga_cv_ipforward_method="sysctl";;
+  *)                 frr_cv_ipforward_method="sysctl";;
 esac])
-IPFORWARD=ipforward_${quagga_cv_ipforward_method}.o
+IPFORWARD=ipforward_${frr_cv_ipforward_method}.o
 AC_SUBST(IPFORWARD)
 
 dnl ----------------------------------------------------------------------------
@@ -1100,10 +1105,10 @@ dnl IPv6 header checks
 dnl ------------------
 AC_CHECK_HEADERS([netinet6/in6.h netinet/in6_var.h \
 	netinet6/in6_var.h netinet6/nd6.h], [], [],
-	QUAGGA_INCLUDES)
+	FRR_INCLUDES)
 
-m4_define([QUAGGA_INCLUDES],dnl
-QUAGGA_INCLUDES
+m4_define([FRR_INCLUDES],dnl
+FRR_INCLUDES
 [#if HAVE_NETINET6_IN6_H
 #include <netinet6/in6.h>
 #endif
@@ -1165,12 +1170,12 @@ else
 fi
 AM_CONDITIONAL(LDPD, test "x$LDPD" = "xldpd")
 
-if test "${enable_watchquagga}" = "no";then
-  WATCHQUAGGA=""
+if test "${enable_watchfrr}" = "no";then
+  WATCHFRR=""
 else
-  WATCHQUAGGA="watchquagga"
+  WATCHFRR="watchfrr"
 fi
-AM_CONDITIONAL(WATCHQUAGGA, test "x$WATCHQUAGGA" = "xwatchquagga")
+AM_CONDITIONAL(WATCHFRR, test "x$WATCHFRR" = "xwatchfrr")
 
 OSPFCLIENT=""
 if test "${enable_ospfapi}" != "no";then
@@ -1245,7 +1250,7 @@ AC_SUBST(RIPNGD)
 AC_SUBST(OSPFD)
 AC_SUBST(OSPF6D)
 AC_SUBST(LDPD)
-AC_SUBST(WATCHQUAGGA)
+AC_SUBST(WATCHFRR)
 AC_SUBST(ISISD)
 AC_SUBST(PIMD)
 AC_SUBST(SOLARIS)
@@ -1313,14 +1318,14 @@ AC_CHECK_TYPES([
 	struct ifaliasreq, struct if6_aliasreq, struct in6_aliasreq,
 	struct nd_opt_adv_interval, struct rt_addrinfo,
 	struct nd_opt_homeagent_info, struct nd_opt_adv_interval],
-	[], [], QUAGGA_INCLUDES)
+	[], [], FRR_INCLUDES)
 
 AC_CHECK_MEMBERS([struct sockaddr.sa_len,
 	struct sockaddr_in.sin_len, struct sockaddr_un.sun_len,
 	struct sockaddr_dl.sdl_len,
 	struct if6_aliasreq.ifra_lifetime,
 	struct nd_opt_adv_interval.nd_opt_ai_type],
-	[], [], QUAGGA_INCLUDES)
+	[], [], FRR_INCLUDES)
 
 dnl ---------------------------
 dnl IRDP/pktinfo/icmphdr checks
@@ -1332,10 +1337,10 @@ AC_CHECK_TYPES([struct in_pktinfo],
     fi],
    [if test "${enable_irdp}" = "yes"; then
       AC_MSG_ERROR(['IRDP requires in_pktinfo at the moment!'])
-    fi], [QUAGGA_INCLUDES])],
+    fi], [FRR_INCLUDES])],
  [if test "${enable_irdp}" = "yes"; then
     AC_MSG_ERROR(['IRDP requires in_pktinfo at the moment!'])
-  fi], [QUAGGA_INCLUDES])
+  fi], [FRR_INCLUDES])
 
 dnl -----------------------
 dnl checking for IP_PKTINFO
@@ -1408,7 +1413,7 @@ dnl --------------------------------------
 AC_CHECK_DECL(CLOCK_MONOTONIC,
 	[AC_CHECK_LIB(rt, clock_gettime, [LIBS="$LIBS -lrt"])
 	 AC_DEFINE(HAVE_CLOCK_MONOTONIC,, Have monotonic clock)
-], [AC_MSG_RESULT(no)], [QUAGGA_INCLUDES])
+], [AC_MSG_RESULT(no)], [FRR_INCLUDES])
 
 dnl --------------------------------------
 dnl checking for flex and bison
@@ -1478,17 +1483,17 @@ if test "${enable_capabilities}" != "no"; then
   AC_TRY_COMPILE([#include <sys/prctl.h>],[prctl(PR_SET_KEEPCAPS, 1, 0, 0, 0);],
     [AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_PR_SET_KEEPCAPS,,prctl)
-     quagga_ac_keepcaps="yes"],
+     frr_ac_keepcaps="yes"],
      AC_MSG_RESULT(no)
   )
-  if test x"${quagga_ac_keepcaps}" = x"yes"; then
+  if test x"${frr_ac_keepcaps}" = x"yes"; then
     AC_CHECK_HEADERS(sys/capability.h)
   fi
   if test x"${ac_cv_header_sys_capability_h}" = x"yes"; then
     AC_CHECK_LIB(cap, cap_init, 
       [AC_DEFINE(HAVE_LCAPS,1,Capabilities)
        LIBCAP="-lcap"
-       quagga_ac_lcaps="yes"]
+       frr_ac_lcaps="yes"]
     )
   else
     AC_CHECK_HEADERS(priv.h,
@@ -1496,14 +1501,14 @@ if test "${enable_capabilities}" != "no"; then
       AC_TRY_COMPILE([#include <priv.h>],[getpflags(PRIV_AWARE);],
     	  [AC_MSG_RESULT(yes)
     	   AC_DEFINE(HAVE_SOLARIS_CAPABILITIES,1,getpflags)
-    	   quagga_ac_scaps="yes"],
+    	   frr_ac_scaps="yes"],
     	   AC_MSG_RESULT(no)
       )
      ]
    )
   fi
-  if test x"${quagga_ac_scaps}" = x"yes" \
-       -o x"${quagga_ac_lcaps}" = x"yes"; then
+  if test x"${frr_ac_scaps}" = x"yes" \
+       -o x"${frr_ac_lcaps}" = x"yes"; then
     AC_DEFINE(HAVE_CAPABILITIES,1,capabilities)
   fi
 fi
@@ -1543,7 +1548,7 @@ AC_CHECK_HEADER([malloc.h],
        AC_DEFINE(HAVE_MALLINFO,,mallinfo)],
        AC_MSG_RESULT(no)
   )
- ], [], QUAGGA_INCLUDES)
+ ], [], FRR_INCLUDES)
 
 dnl ----------
 dnl configure date
@@ -1568,54 +1573,54 @@ dnl set paths for state directory
 dnl ------------------------------
 AC_MSG_CHECKING(directory to use for state file)
 if test "${prefix}" = "NONE"; then
-  quagga_statedir_prefix="";
+  frr_statedir_prefix="";
 else
-  quagga_statedir_prefix=${prefix}
+  frr_statedir_prefix=${prefix}
 fi
 if test "${localstatedir}" = '${prefix}/var'; then
-  for QUAGGA_STATE_DIR in ${quagga_statedir_prefix}/var/run dnl
-			${quagga_statedir_prefix}/var/adm dnl
-			${quagga_statedir_prefix}/etc dnl
+  for FRR_STATE_DIR in ${frr_statedir_prefix}/var/run dnl
+			${frr_statedir_prefix}/var/adm dnl
+			${frr_statedir_prefix}/etc dnl
 			/var/run	dnl
                         /var/adm	dnl
                         /etc		dnl
                         /dev/null;
   do
-    test -d $QUAGGA_STATE_DIR && break
+    test -d $FRR_STATE_DIR && break
   done
-  quagga_statedir=$QUAGGA_STATE_DIR
+  frr_statedir=$FRR_STATE_DIR
 else
-  quagga_statedir=${localstatedir}
+  frr_statedir=${localstatedir}
 fi
-if test $quagga_statedir = "/dev/null"; then
+if test $frr_statedir = "/dev/null"; then
     AC_MSG_ERROR('STATE DIRECTORY NOT FOUND! FIX OR SPECIFY --localstatedir!')
 fi
-AC_MSG_RESULT(${quagga_statedir})
-AC_SUBST(quagga_statedir)
-
-AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$quagga_statedir/zebra.pid",zebra PID)
-AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$quagga_statedir/ripd.pid",ripd PID)
-AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$quagga_statedir/ripngd.pid",ripngd PID)
-AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$quagga_statedir/bgpd.pid",bgpd PID)
-AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$quagga_statedir/ospfd.pid",ospfd PID)
-AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$quagga_statedir/ospf6d.pid",ospf6d PID)
-AC_DEFINE_UNQUOTED(PATH_LDPD_PID, "$quagga_statedir/ldpd.pid",ldpd PID)
-AC_DEFINE_UNQUOTED(LDPD_SOCKET, "$quagga_statedir/ldpd.sock",ldpd control socket)
-AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$quagga_statedir/isisd.pid",isisd PID)
-AC_DEFINE_UNQUOTED(PATH_PIMD_PID, "$quagga_statedir/pimd.pid",pimd PID)
-AC_DEFINE_UNQUOTED(PATH_WATCHQUAGGA_PID, "$quagga_statedir/watchquagga.pid",watchquagga PID)
-AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$quagga_statedir/zserv.api",zebra api socket)
-AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$quagga_statedir/zebra.vty",zebra vty socket)
-AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$quagga_statedir/ripd.vty",rip vty socket)
-AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$quagga_statedir/ripngd.vty",ripng vty socket)
-AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$quagga_statedir/bgpd.vty",bgpd vty socket)
-AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$quagga_statedir/ospfd.vty",ospfd vty socket)
-AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$quagga_statedir/ospf6d.vty",ospf6d vty socket)
-AC_DEFINE_UNQUOTED(LDP_VTYSH_PATH, "$quagga_statedir/ldpd.vty",ldpd vty socket)
-AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$quagga_statedir/isisd.vty",isisd vty socket)
-AC_DEFINE_UNQUOTED(PIM_VTYSH_PATH, "$quagga_statedir/pimd.vty",pimd vty socket)
-AC_DEFINE_UNQUOTED(WATCHQUAGGA_VTYSH_PATH, "$quagga_statedir/watchquagga.vty",watchquagga vty socket)
-AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$quagga_statedir",daemon vty directory)
+AC_MSG_RESULT(${frr_statedir})
+AC_SUBST(frr_statedir)
+
+AC_DEFINE_UNQUOTED(PATH_ZEBRA_PID, "$frr_statedir/zebra.pid",zebra PID)
+AC_DEFINE_UNQUOTED(PATH_RIPD_PID, "$frr_statedir/ripd.pid",ripd PID)
+AC_DEFINE_UNQUOTED(PATH_RIPNGD_PID, "$frr_statedir/ripngd.pid",ripngd PID)
+AC_DEFINE_UNQUOTED(PATH_BGPD_PID, "$frr_statedir/bgpd.pid",bgpd PID)
+AC_DEFINE_UNQUOTED(PATH_OSPFD_PID, "$frr_statedir/ospfd.pid",ospfd PID)
+AC_DEFINE_UNQUOTED(PATH_OSPF6D_PID, "$frr_statedir/ospf6d.pid",ospf6d PID)
+AC_DEFINE_UNQUOTED(PATH_LDPD_PID, "$frr_statedir/ldpd.pid",ldpd PID)
+AC_DEFINE_UNQUOTED(LDPD_SOCKET, "$frr_statedir/ldpd.sock",ldpd control socket)
+AC_DEFINE_UNQUOTED(PATH_ISISD_PID, "$frr_statedir/isisd.pid",isisd PID)
+AC_DEFINE_UNQUOTED(PATH_PIMD_PID, "$frr_statedir/pimd.pid",pimd PID)
+AC_DEFINE_UNQUOTED(PATH_WATCHFRR_PID, "$frr_statedir/watchfrr.pid",watchfrr PID)
+AC_DEFINE_UNQUOTED(ZEBRA_SERV_PATH, "$frr_statedir/zserv.api",zebra api socket)
+AC_DEFINE_UNQUOTED(ZEBRA_VTYSH_PATH, "$frr_statedir/zebra.vty",zebra vty socket)
+AC_DEFINE_UNQUOTED(RIP_VTYSH_PATH, "$frr_statedir/ripd.vty",rip vty socket)
+AC_DEFINE_UNQUOTED(RIPNG_VTYSH_PATH, "$frr_statedir/ripngd.vty",ripng vty socket)
+AC_DEFINE_UNQUOTED(BGP_VTYSH_PATH, "$frr_statedir/bgpd.vty",bgpd vty socket)
+AC_DEFINE_UNQUOTED(OSPF_VTYSH_PATH, "$frr_statedir/ospfd.vty",ospfd vty socket)
+AC_DEFINE_UNQUOTED(OSPF6_VTYSH_PATH, "$frr_statedir/ospf6d.vty",ospf6d vty socket)
+AC_DEFINE_UNQUOTED(LDP_VTYSH_PATH, "$frr_statedir/ldpd.vty",ldpd vty socket)
+AC_DEFINE_UNQUOTED(ISIS_VTYSH_PATH, "$frr_statedir/isisd.vty",isisd vty socket)
+AC_DEFINE_UNQUOTED(PIM_VTYSH_PATH, "$frr_statedir/pimd.vty",pimd vty socket)
+AC_DEFINE_UNQUOTED(WATCHFRR_VTYSH_PATH, "$frr_statedir/watchfrr.vty",watchfrr vty socket)
+AC_DEFINE_UNQUOTED(DAEMON_VTY_DIR, "$frr_statedir",daemon vty directory)
 
 dnl autoconf does this, but it does it too late...
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
@@ -1628,6 +1633,18 @@ for I in 1 2 3 4 5 6 7 8 9 10; do
 done
 AC_DEFINE_UNQUOTED(VTYSH_BIN_PATH, "$vtysh_bin",path to vtysh binary)
 
+CFG_SYSCONF="$sysconfdir"
+CFG_SBIN="$sbindir"
+CFG_STATE="$frr_statedir"
+for I in 1 2 3 4 5 6 7 8 9 10; do
+	eval CFG_SYSCONF="\"$CFG_SYSCONF\""
+	eval CFG_SBIN="\"$CFG_SBIN\""
+	eval CFG_STATE="\"$CFG_STATE\""
+done
+AC_SUBST(CFG_SYSCONF)
+AC_SUBST(CFG_SBIN)
+AC_SUBST(CFG_STATE)
+
 dnl -------------------------------
 dnl Quagga sources should always be 
 dnl current wrt interfaces. Dont
@@ -1641,14 +1658,14 @@ dnl Check htonl works correctly
 dnl ---------------------------
 AC_MSG_CHECKING(for working htonl)
 AC_CACHE_VAL(ac_cv_htonl_works,
- [AC_LINK_IFELSE([AC_LANG_PROGRAM([QUAGGA_INCLUDES],[htonl (0);])],
+ [AC_LINK_IFELSE([AC_LANG_PROGRAM([FRR_INCLUDES],[htonl (0);])],
  		[ac_cv_htonl_works=yes], [ac_cv_htonl_works=no])
  ]
 )
 AC_MSG_RESULT($ac_cv_htonl_works)
 
 AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile 
-	  ripngd/Makefile bgpd/Makefile ospfd/Makefile watchquagga/Makefile
+	  ripngd/Makefile bgpd/Makefile ospfd/Makefile watchfrr/Makefile
 	  ospf6d/Makefile ldpd/Makefile isisd/Makefile vtysh/Makefile
 	  doc/Makefile ospfclient/Makefile tests/Makefile m4/Makefile
 	  pimd/Makefile
@@ -1662,6 +1679,19 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
 	  redhat/quagga.spec 
 	  lib/version.h
 	  doc/defines.texi
+	  doc/bgpd.8
+	  doc/isisd.8
+	  doc/ospf6d.8
+	  doc/ospfclient.8
+	  doc/ospfd.8
+	  doc/ldpd.8
+	  doc/ripd.8
+	  doc/ripngd.8
+	  doc/pimd.8
+	  doc/vtysh.1
+	  doc/watchfrr.8
+	  doc/zebra.8
+	  doc/frr.1
 	  pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
 	  pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh])
 
@@ -1682,21 +1712,21 @@ AC_CONFIG_FILES([vtysh/extract.pl],[chmod +x vtysh/extract.pl])
 AC_OUTPUT
 
 echo "
-Quagga configuration
---------------------
-quagga version          : ${PACKAGE_VERSION}
+FreeRangeRouting configuration
+------------------------------
+FRR version             : ${PACKAGE_VERSION}
 host operating system   : ${host_os}
 source code location    : ${srcdir}
 compiler                : ${CC}
 compiler flags          : ${CFLAGS}
 make                    : ${MAKE-make}
 linker flags            : ${LDFLAGS} ${LIBS} ${LIBCAP} ${LIBREADLINE} ${LIBM}
-state file directory    : ${quagga_statedir}
+state file directory    : ${frr_statedir}
 config file directory   : `eval echo \`echo ${sysconfdir}\``
 example directory       : `eval echo \`echo ${exampledir}\``
-user to run as		: ${enable_user}
-group to run as		: ${enable_group}
-group for vty sockets	: ${enable_vty_group}
+user to run as          : ${enable_user}
+group to run as         : ${enable_group}
+group for vty sockets   : ${enable_vty_group}
 config file mask        : ${enable_configfile_mask}
 log file mask           : ${enable_logfile_mask}
 zebra protobuf enabled  : ${have_protobuf:-no}
diff --git a/cumulus/etc/quagga/daemons b/cumulus/etc/quagga/daemons
index dd0e23914..c7b8496a4 100644
--- a/cumulus/etc/quagga/daemons
+++ b/cumulus/etc/quagga/daemons
@@ -18,7 +18,7 @@
 # When using "vtysh" such a config file is also needed. It should be owned by
 # group "quaggavty" and set to ug=rw,o= though. Check /etc/pam.d/quagga, too.
 #
-# The watchquagga daemon is always started. Per default in monitoring-only but
+# The watchfrr daemon is always started. Per default in monitoring-only but
 # that can be changed via /etc/quagga/debian.conf.
 #
 zebra=no
diff --git a/cumulus/etc/quagga/debian.conf b/cumulus/etc/quagga/debian.conf
index 88df9424e..bd1fcecf9 100644
--- a/cumulus/etc/quagga/debian.conf
+++ b/cumulus/etc/quagga/debian.conf
@@ -14,5 +14,5 @@ isisd_options="  --daemon -A 127.0.0.1"
 pimd_options="  --daemon -A 127.0.0.1"
 
 # The list of daemons to watch is automatically generated by the init script.
-watchquagga_enable=yes
-watchquagga_options=(-adz -r /usr/sbin/servicebBquaggabBrestartbB%s -s /usr/sbin/servicebBquaggabBstartbB%s -k /usr/sbin/servicebBquaggabBstopbB%s -b bB -t 30)
+watchfrr_enable=yes
+watchfrr_options=(-adz -r /usr/sbin/servicebBquaggabBrestartbB%s -s /usr/sbin/servicebBquaggabBstartbB%s -k /usr/sbin/servicebBquaggabBstopbB%s -b bB -t 30)
diff --git a/debian/README.Debian b/debian/README.Debian
index 7bec53230..fb481eb45 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,34 +2,34 @@
 ==================
 
 Please consider setting this package "on hold" by typing
-    echo "quagga hold" | dpkg --set-selections
+    echo "frr hold" | dpkg --set-selections
 and verifying this using
     dpkg --get-selections | grep 'hold$'
 
 Setting a package "on hold" means that it will not automatically be upgraded.
 Instead apt-get only displays a warning saying that a new version would be
-available forcing you to explicitly type "apt-get install quagga" to upgrade it.
+available forcing you to explicitly type "apt-get install frr" to upgrade it.
 
 
-* What is quagga?
+* What is frr?
 =================
 
-http://www.quagga.net/
-> Quagga is a routing software suite, providing implementations of OSPFv2,
+http://www.freerangerouting.net/
+> Frr is a routing software suite, providing implementations of OSPFv2,
 > OSPFv3, RIP v1 and v2, RIPv3 and BGPv4 for Unix platforms, particularly
-> FreeBSD and Linux and also NetBSD, to mention a few. Quagga is a fork of GNU
+> FreeBSD and Linux and also NetBSD, to mention a few. Frr is a fork of GNU
 > Zebra which was developed by Kunihiro Ishiguro. Development of GNU Zebra
 > slowed dramatically to the point where eventually GNU Zebra was forked into
-> Quagga.
+> Frr.
 
-> The Quagga tree is an attempt to provide a zebra tree with at least the
+> The Frr tree is an attempt to provide a zebra tree with at least the
 > bug-fixes, which have accumulated, applied, while tracking any significant
 > changes made to the zebra.org tree. Ultimately, this tree hopes to revitalise
 > development of this code base.
 
-I packaged zebra-pj which was then renamed to quagga to get people used to it
+I packaged zebra-pj which was then renamed to frr to get people used to it
 and offer Debian users the choice which versions they like to use. I hope this
-brings quagga some feedback and helps it evolving to a good successor of the
+brings frr some feedback and helps it evolving to a good successor of the
 orphaned zebra.
 
  -- Christian Hammers <ch@debian.org>, Jul/Aug 2003
@@ -37,16 +37,16 @@ orphaned zebra.
 
 * Why has SNMP support been disabled?
 =====================================
-Quagga used to link against the NetSNMP libraries to provide SNMP
+Frr used to link against the NetSNMP libraries to provide SNMP
 support. Those libraries sadly link against the OpenSSL libraries
 to provide crypto support for SNMPv3 among others.
 OpenSSL now is not compatible with the GNU GENERAL PUBLIC LICENSE (GPL)
-licence that Quagga is distributed under. For more explanation read:
+licence that Frr is distributed under. For more explanation read:
   http://www.gnome.org/~markmc/openssl-and-the-gpl.html
   http://www.gnu.org/licenses/gpl-faq.html#GPLIncompatibleLibs
 Updating the licence to explecitly allow linking against OpenSSL
 would requite the affirmation of all people that ever contributed
-a significant part to Zebra or Quagga and thus are the collective
+a significant part to Zebra or Frr and thus are the collective
 "copyright holder". That's too much work. Using a shrinked down 
 version of NetSNMP without OpenSSL or convincing the NetSNMP people
 to change to GnuTLS are maybe good solutions but not reachable
@@ -55,17 +55,17 @@ during the last days before the Sarge release :-(
         *BUT*
 
 It is allowed by the used licence mix that you fetch the sources and
-build Quagga yourself with SNMP with
-	<remove the "grep ^smux" block at the end of debian/quagga.preinst>
+build Frr yourself with SNMP with
+	<remove the "grep ^smux" block at the end of debian/frr.preinst>
         # export WANT_SNMP=1
-        # apt-get -b source quagga
+        # apt-get -b source frr
 Just distributing it in binary form, linked against OpenSSL, is forbidden.
 
 
 * Daemon selection:
 ===================
 
-The Debian package uses /etc/quagga/daemons to tell the
+The Debian package uses /etc/frr/daemons to tell the
 initscript which daemons to start. It's in the format
 <daemon>=<yes|no|priority>
 with no spaces (it's simply source-d into the initscript).
@@ -73,13 +73,13 @@ Default is not to start anything, since it can hose your
 system's routing table if not set up properly.
 
 Priorities were suggested by Dancer <dancer@zeor.simegen.com>.
-They're used to start the Quagga daemons in more than one step
+They're used to start the Frr daemons in more than one step
 (for example start one or two at network initialization and the
-rest later). The number of Quagga daemons being small, priorities
+rest later). The number of Frr daemons being small, priorities
 must be between 1 and 9, inclusive (or the initscript has to be
-changed). /etc/init.d/quagga then can be started as
+changed). /etc/init.d/frr then can be started as
 
-/etc/init.d/quagga <start|stop|restart|<priority>>
+/etc/init.d/frr <start|stop|restart|<priority>>
 
 where priority 0 is the same as 'stop', priority 10 or 'start'
 means 'start all'
@@ -96,15 +96,15 @@ into the kernel.
 =====================================================================
 
 If this message occurs the receive buffer should be increased by adding the
-following to /etc/sysctl.conf and "--nl-bufsize" to /etc/quagga/debian.conf.
+following to /etc/sysctl.conf and "--nl-bufsize" to /etc/frr/debian.conf.
 > net.core.rmem_default = 262144
 > net.core.rmem_max = 262144
-See message #4525 from 2005-05-09 in the quagga-users mailing list.
+See message #4525 from 2005-05-09 in the frr-users mailing list.
 
 
 * vtysh immediately exists:
 ===========================
 
-Check /etc/pam.d/quagga, it probably denies access to your user. The passwords
-configured in /etc/quagga/Quagga.conf are only for telnet access.
+Check /etc/pam.d/frr, it probably denies access to your user. The passwords
+configured in /etc/frr/Frr.conf are only for telnet access.
 
diff --git a/debian/README.Maintainer b/debian/README.Maintainer
index b0b1e62b3..aa8ac0cf3 100644
--- a/debian/README.Maintainer
+++ b/debian/README.Maintainer
@@ -4,19 +4,19 @@
 for i in debian/patches/*.diff; do echo -e "#\n# $i\n#"; patch --fuzz=3 --dry-run -p1 < $i; done
 
 #
-# Filename transition from zebra to quagga
+# Filename transition from zebra to frr
 #
 
 Files that keep their names
 	/usr/bin/vtysh
 
 Files that got an -pj suffix
-	/etc/default/zebra	-> /etc/quagga/debian.conf
-	/etc/init.d/zebra	-> /etc/init.d/quagga
-	/etc/zebra/		-> /etc/quagga/
-	/usr/share/doc/zebra/	-> /usr/share/doc/quagga/
-	/var/log/zebra/		-> /var/log/quagga/
-	/var/run/ 		-> /var/run/quagga/
+	/etc/default/zebra	-> /etc/frr/debian.conf
+	/etc/init.d/zebra	-> /etc/init.d/frr
+	/etc/zebra/		-> /etc/frr/
+	/usr/share/doc/zebra/	-> /usr/share/doc/frr/
+	/var/log/zebra/		-> /var/log/frr/
+	/var/run/ 		-> /var/run/frr/
 
 Files that were moved
-	/usr/sbin/*		-> /usr/lib/quagga/
+	/usr/sbin/*		-> /usr/lib/frr/
diff --git a/debian/changelog b/debian/changelog
index f17f89eaf..ef019b4d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,7 @@
+frr (2.0) Released; urgency=medium
+
+  * Switchover to FRR
+
 quagga (0.99.24+cl3u5) RELEASED; urgency=medium
 
   * Closes: CM-12846 - Resolve Memory leaks in 'show ip bgp neighbor json'
diff --git a/debian/control b/debian/control
index 3bd4e21a9..ac9298425 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
-Source: quagga
+Source: frr
 Section: net
 Priority: optional
 Maintainer: Christian Hammers <ch@debian.org>
 Uploaders: Florian Weimer <fw@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), libncurses5-dev, libreadline-dev, texlive-latex-base, texlive-generic-recommended, libpam0g-dev | libpam-dev, libcap-dev, texinfo (>= 4.7), imagemagick, ghostscript, groff, po-debconf, autotools-dev, hardening-wrapper, libpcre3-dev, gawk, chrpath, libsnmp-dev, git, dh-autoreconf, libjson0, libjson0-dev, dh-systemd, libsystemd-dev, python-ipaddr, bison, flex
 Standards-Version: 3.9.6
-Homepage: http://www.quagga.net/
+Homepage: http://www.frr.net/
 XS-Testsuite: autopkgtest
 
-Package: quagga
+Package: frr
 Architecture: any
 Depends: ${shlibs:Depends}, logrotate (>= 3.2-11), iproute, ${misc:Depends}
 Pre-Depends: adduser
@@ -16,37 +16,33 @@ Conflicts: zebra, zebra-pj
 Replaces: zebra, zebra-pj
 Suggests: snmpd
 Description: BGP/OSPF/RIP routing daemon
- GNU Quagga is free software which manages TCP/IP based routing protocols.
+ Frr is free software which manages TCP/IP based routing protocols.
  It supports BGP4, BGP4+, OSPFv2, OSPFv3, IS-IS, RIPv1, RIPv2, and RIPng as
  well as the IPv6 versions of these.
  .
- As the precessor Zebra has been considered orphaned, the Quagga project
- has been formed by members of the zebra mailing list and the former
- zebra-pj project to continue developing.
- .
- Quagga uses threading if the kernel supports it, but can also run on
+ Frr uses threading if the kernel supports it, but can also run on
  kernels that do not support threading. Each protocol has its own daemon.
  .
  It is more than a routed replacement, it can be used as a Route Server and
  a Route Reflector.
 
-Package: quagga-dbg
+Package: frr-dbg
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, quagga (= ${binary:Version})
+Depends: ${shlibs:Depends}, ${misc:Depends}, frr (= ${binary:Version})
 Priority: extra
 Section: debug
 Description: BGP/OSPF/RIP routing daemon (debug symbols)
  This package provides debugging symbols for all binary packages built from                                                                                                                                                                    
- quagga source package. It's highly recommended to have this package installed                                                                                                                                                                 
- before reporting any Quagga crashes to either Quagga developers or Debian                                                                                                                                                                     
+ frr source package. It's highly recommended to have this package installed                                                                                                                                                                 
+ before reporting any Frr crashes to either Frr developers or Debian                                                                                                                                                                     
  package maintainers.
 
-Package: quagga-doc
+Package: frr-doc
 Section: net
 Architecture: all
 Depends: ${misc:Depends}
-Suggests: quagga
-Description: documentation files for quagga
- This package includes info files for quagga, a free software which manages
+Suggests: frr
+Description: documentation files for frr
+ This package includes info files for frr, a free software which manages
  TCP/IP based routing protocols.  It supports BGP4, BGP4+, OSPFv2, OSPFv3,
  IS-IS, RIPv1, RIPv2, and RIPng as well as the IPv6 versions of these.
diff --git a/debian/copyright b/debian/copyright
index 22434fb25..ab392027c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: Quagga
-Upstream-Contact: maintainers@quagga.net, security@quagga.net
-Source: http://www.quagga.net/
+Upstream-Name: Frr
+Upstream-Contact: maintainers@freerangerouting.net, security@freerangerouting.net
+Source: http://www.freerangerouting.net/
 
 Files: *
 Copyright: 1996-2003 by the original Zebra authors:
diff --git a/debian/quagga-doc.docs b/debian/frr-doc.docs
index a0776fd68..a0776fd68 100644
--- a/debian/quagga-doc.docs
+++ b/debian/frr-doc.docs
diff --git a/debian/frr-doc.info b/debian/frr-doc.info
new file mode 100644
index 000000000..c4f181cdb
--- /dev/null
+++ b/debian/frr-doc.info
@@ -0,0 +1 @@
+doc/frr.info*
diff --git a/debian/quagga-doc.install b/debian/frr-doc.install
index d2d3f1bbd..d2d3f1bbd 100644
--- a/debian/quagga-doc.install
+++ b/debian/frr-doc.install
diff --git a/debian/frr-doc.lintian-overrides b/debian/frr-doc.lintian-overrides
new file mode 100644
index 000000000..1fe64ffd5
--- /dev/null
+++ b/debian/frr-doc.lintian-overrides
@@ -0,0 +1 @@
+frr-doc: wrong-section-according-to-package-name frr-doc => doc
diff --git a/debian/frr.conf b/debian/frr.conf
new file mode 100644
index 000000000..dee3cd849
--- /dev/null
+++ b/debian/frr.conf
@@ -0,0 +1,2 @@
+# Create the /run/frr directory at boot or from systemd-tmpfiles on install
+d /run/frr 0755 frr frr
diff --git a/debian/quagga.config b/debian/frr.config
index f642bea1d..f642bea1d 100644
--- a/debian/quagga.config
+++ b/debian/frr.config
diff --git a/debian/frr.dirs b/debian/frr.dirs
new file mode 100644
index 000000000..58290080d
--- /dev/null
+++ b/debian/frr.dirs
@@ -0,0 +1,7 @@
+etc/logrotate.d/
+etc/frr/
+usr/share/doc/frr/
+usr/share/doc/frr/examples/
+usr/share/lintian/overrides/
+usr/share/snmp/mibs/
+var/log/frr/
diff --git a/debian/quagga.docs b/debian/frr.docs
index f72aae196..f72aae196 100644
--- a/debian/quagga.docs
+++ b/debian/frr.docs
diff --git a/debian/quagga.install b/debian/frr.install
index 6a70be992..45b3b973b 100644
--- a/debian/quagga.install
+++ b/debian/frr.install
@@ -1,12 +1,12 @@
-etc/quagga/
+etc/frr/
 usr/bin/vtysh
-usr/include/quagga/
+usr/include/frr/
 usr/lib/
-tools/quagga-reload.py usr/lib/quagga/
-tools/quagga usr/lib/quagga
-usr/share/doc/quagga/
+tools/frr-reload.py usr/lib/frr/
+tools/frr usr/lib/frr
+usr/share/doc/frr/
 usr/share/man/man1/vtysh.1
-usr/share/man/man1/quagga.1
+usr/share/man/man1/frr.1
 usr/share/man/man8
 usr/share/man/man8/bgpd.8
 usr/share/man/man8/ospf6d.8
@@ -15,8 +15,8 @@ usr/share/man/man8/ripd.8
 usr/share/man/man8/ripngd.8
 usr/share/man/man8/zebra.8
 usr/share/man/man8/isisd.8
-usr/share/man/man8/watchquagga.8
+usr/share/man/man8/watchfrr.8
 usr/share/snmp/mibs/
 cumulus/etc/* etc/
 tools/*.service    lib/systemd/system
-debian/quagga.conf  usr/lib/tmpfiles.d
+debian/frr.conf  usr/lib/tmpfiles.d
diff --git a/debian/frr.lintian-overrides b/debian/frr.lintian-overrides
new file mode 100644
index 000000000..42a51b5e6
--- /dev/null
+++ b/debian/frr.lintian-overrides
@@ -0,0 +1,4 @@
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libospfapiclient.so.0.0.0 usr/lib/libospfapiclient.so
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libospf.so.0.0.0 usr/lib/libospf.so
+frr: non-dev-pkg-with-shlib-symlink usr/lib/libzebra.so.0.0.0 usr/lib/libzebra.so
+frr: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libzebra0
diff --git a/debian/quagga.logrotate b/debian/frr.logrotate
index 77e015d72..0dd68fb25 100644
--- a/debian/quagga.logrotate
+++ b/debian/frr.logrotate
@@ -1,15 +1,15 @@
-/var/log/quagga/*.log {
+/var/log/frr/*.log {
         size 500k
         sharedscripts
         missingok
         compress
         rotate 14
-        create 640 quagga quaggavty
+        create 640 frr frrvty
 
         postrotate
 		for i in zebra bgpd ripd ospfd ripngd ospf6d isisd pimd; do
-                        if [ -e /var/run/quagga/$i.pid ] ; then
-				kill -USR1 `cat /var/run/quagga/$i.pid`
+                        if [ -e /var/run/frr/$i.pid ] ; then
+				kill -USR1 `cat /var/run/frr/$i.pid`
                         fi
 
                 done
diff --git a/debian/quagga.manpages b/debian/frr.manpages
index 194b13af6..17a128b7e 100644
--- a/debian/quagga.manpages
+++ b/debian/frr.manpages
@@ -6,4 +6,4 @@ doc/ripngd.8
 doc/vtysh.1
 doc/zebra.8
 doc/isisd.8
-doc/watchquagga.8
+doc/watchfrr.8
diff --git a/debian/quagga.pam b/debian/frr.pam
index 093e17294..2b106d43b 100644
--- a/debian/quagga.pam
+++ b/debian/frr.pam
@@ -1,3 +1,3 @@
-# Any user may call vtysh but only those belonging to the group quaggavty can
+# Any user may call vtysh but only those belonging to the group frrvty can
 # actually connect to the socket and use the program.
 auth	sufficient	pam_permit.so
diff --git a/debian/frr.postinst b/debian/frr.postinst
new file mode 100644
index 000000000..43d3ffa9e
--- /dev/null
+++ b/debian/frr.postinst
@@ -0,0 +1,41 @@
+#!/bin/bash -e
+
+######################
+PASSWDFILE=/etc/passwd
+GROUPFILE=/etc/group
+
+frruid=`egrep "^frr:" $PASSWDFILE | awk -F ":" '{ print $3 }'`
+frrgid=`egrep "^frr:" $GROUPFILE | awk -F ":" '{ print $3 }'`
+frrvtygid=`egrep "^frrvty:" $GROUPFILE | awk -F ":" '{ print $3 }'`
+
+[ -n ${frruid} ]    || (echo "No uid for frr in ${PASSWDFILE}"   && /bin/false)
+[ -n ${frrgid} ]    || (echo "No gid for frr in ${GROUPFILE}"    && /bin/false)
+[ -n ${frrVTYgid} ] || (echo "No gid for frrvty in ${GROUPFILE}" && /bin/false)
+
+chown -R ${frruid}:${frrgid} /etc/frr
+touch /etc/frr/vtysh.conf
+chgrp ${frrvtygid} /etc/frr/vtysh*
+chmod 440 /etc/sudoers.d/frr_sudoers
+chmod 644 /etc/frr/*
+
+ENVIRONMENTFILE=/etc/environment
+if ! grep --quiet VTYSH_PAGER=/bin/cat ${ENVIRONMENTFILE}; then
+    echo "VTYSH_PAGER=/bin/cat"  >> ${ENVIRONMENTFILE}
+fi
+##################################################
+
+if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
+${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
+
+# This is most likely due to the answer "no" to the "really stop the server"
+# question in the prerm script.
+if [ "$1" = "abort-upgrade" ]; then
+  exit 0
+fi
+
+. /usr/share/debconf/confmodule
+
+db_stop
+
+#DEBHELPER#
+
diff --git a/debian/quagga.postrm b/debian/frr.postrm
index 1c69e4899..26576fd13 100644
--- a/debian/quagga.postrm
+++ b/debian/frr.postrm
@@ -5,8 +5,8 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
 # set -u	not because of debhelper
 
 if [ "$1" = "purge" ]; then
-	rm -rf /etc/quagga /var/run/quagga /var/log/quagga
-  	userdel quagga >/dev/null 2>&1 || true
+	rm -rf /etc/frr /var/run/frr /var/log/frr
+  	userdel frr >/dev/null 2>&1 || true
 fi
 
 #DEBHELPER#
diff --git a/debian/quagga.preinst b/debian/frr.preinst
index 1af0b5ba6..abdaa7277 100644
--- a/debian/quagga.preinst
+++ b/debian/frr.preinst
@@ -5,73 +5,73 @@ ${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
 set -e
 set -u
 
-# creating quaggavty group if it isn't already there
-if ! getent group quaggavty >/dev/null; then
-        addgroup --system quaggavty >/dev/null
+# creating frrvty group if it isn't already there
+if ! getent group frrvty >/dev/null; then
+        addgroup --system frrvty >/dev/null
 fi
 
-# creating quagga group if it isn't already there
-if ! getent group quagga >/dev/null; then
-        addgroup --system quagga >/dev/null
+# creating frr group if it isn't already there
+if ! getent group frr >/dev/null; then
+        addgroup --system frr >/dev/null
 fi
 
-# creating quagga user if he isn't already there
-if ! getent passwd quagga >/dev/null; then
+# creating frr user if he isn't already there
+if ! getent passwd frr >/dev/null; then
         adduser \
           --system \
-          --ingroup quagga \
-          --home /var/run/quagga/ \
-          --gecos "Quagga routing suite" \
+          --ingroup frr \
+          --home /var/run/frr/ \
+          --gecos "Frr routing suite" \
           --shell /bin/false \
-          quagga  >/dev/null
+          frr  >/dev/null
 fi
 
 # We may be installing over an older version of
-# quagga and as such we need to intelligently
-# check to see if the quagga user is in the quaggavty
+# frr and as such we need to intelligently
+# check to see if the frr user is in the frrvty
 # group.
-if ! /usr/bin/id quagga | grep &>/dev/null 'quaggavty'; then
-    usermod -a -G quaggavty quagga >/dev/null
+if ! /usr/bin/id frr | grep &>/dev/null 'frrvty'; then
+    usermod -a -G frrvty frr >/dev/null
 fi
 
 # Do not change permissions when upgrading as it would violate policy.
 if [ "$1" = "install" ]; then
-  # Logfiles are group readable in case users were put into the quagga group.
-  d=/var/log/quagga/
+  # Logfiles are group readable in case users were put into the frr group.
+  d=/var/log/frr/
     mkdir -p $d
-    chown -R quagga:quagga $d
+    chown -R frr:frr $d
     chmod u=rwx,go=rx $d
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,g=r,o=
 
   # Strict permissions for the sockets.
-  d=/var/run/quagga/
+  d=/var/run/frr/
     mkdir -p $d
-    chown -R quagga:quagga $d
+    chown -R frr:frr $d
     chmod u=rwx,go=rx $d
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,go=
 
   # Config files. Vtysh does not have access to the individual daemons config file
-  d=/etc/quagga/
+  d=/etc/frr/
     mkdir -p $d
-    chown quagga:quaggavty $d
+    chown frr:frrvty $d
     chmod ug=rwx,o=rx $d
-    find $d -type f -print0 | xargs -0 --no-run-if-empty   chown quagga:quagga
+    find $d -type f -print0 | xargs -0 --no-run-if-empty   chown frr:frr
     find $d -type f -print0 | xargs -0 --no-run-if-empty   chmod u=rw,g=r,o=
 
     # Exceptions for vtysh.
     f=$d/vtysh.conf
     if [ -f $f ]; then
-      chown quagga:quaggavty $f
+      chown frr:frrvty $f
       chmod u=rw,g=r,o= $f
     fi
 
     # Exceptions for vtysh.
-    f=$d/Quagga.conf
+    f=$d/Frr.conf
     if [ -f $d/Zebra.conf ]; then
       mv $d/Zebra.conf $f
     fi
     if [ -f $f ]; then
-      chown quagga:quaggavty $f
+      chown frr:frrvty $f
       chmod u=rw,g=r,o= $f
     fi
 fi
diff --git a/debian/quagga.prerm b/debian/frr.prerm
index 977541225..e0df24e10 100644
--- a/debian/quagga.prerm
+++ b/debian/frr.prerm
@@ -15,7 +15,7 @@ case $1 in
 	;;
 
   failed-upgrade)
-	# If quagga/really_stop was negated then this script exits with return
+	# If frr/really_stop was negated then this script exits with return
 	# code 1 and is called again with "failed-upgrade". Well, exit again.
 	exit 1
 	;;
diff --git a/debian/quagga-doc.info b/debian/quagga-doc.info
deleted file mode 100644
index c9ff0f55f..000000000
--- a/debian/quagga-doc.info
+++ /dev/null
@@ -1 +0,0 @@
-doc/quagga.info*
diff --git a/debian/quagga-doc.lintian-overrides b/debian/quagga-doc.lintian-overrides
deleted file mode 100644
index afa3c64ad..000000000
--- a/debian/quagga-doc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-quagga-doc: wrong-section-according-to-package-name quagga-doc => doc
diff --git a/debian/quagga.conf b/debian/quagga.conf
deleted file mode 100644
index 04d8eea57..000000000
--- a/debian/quagga.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Create the /run/quagga directory at boot or from systemd-tmpfiles on install
-d /run/quagga 0755 quagga quagga
diff --git a/debian/quagga.dirs b/debian/quagga.dirs
deleted file mode 100644
index 581074f8f..000000000
--- a/debian/quagga.dirs
+++ /dev/null
@@ -1,7 +0,0 @@
-etc/logrotate.d/
-etc/quagga/
-usr/share/doc/quagga/
-usr/share/doc/quagga/examples/
-usr/share/lintian/overrides/
-usr/share/snmp/mibs/
-var/log/quagga/
diff --git a/debian/quagga.lintian-overrides b/debian/quagga.lintian-overrides
deleted file mode 100644
index aee52a1eb..000000000
--- a/debian/quagga.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-quagga: non-dev-pkg-with-shlib-symlink usr/lib/libospfapiclient.so.0.0.0 usr/lib/libospfapiclient.so
-quagga: non-dev-pkg-with-shlib-symlink usr/lib/libospf.so.0.0.0 usr/lib/libospf.so
-quagga: non-dev-pkg-with-shlib-symlink usr/lib/libzebra.so.0.0.0 usr/lib/libzebra.so
-quagga: package-name-doesnt-match-sonames libospf0 libospfapiclient0 libzebra0
diff --git a/debian/quagga.postinst b/debian/quagga.postinst
deleted file mode 100644
index 4611313c1..000000000
--- a/debian/quagga.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash -e
-
-######################
-PASSWDFILE=/etc/passwd
-GROUPFILE=/etc/group
-
-quaggauid=`egrep "^quagga:" $PASSWDFILE | awk -F ":" '{ print $3 }'`
-quaggagid=`egrep "^quagga:" $GROUPFILE | awk -F ":" '{ print $3 }'`
-quaggavtygid=`egrep "^quaggavty:" $GROUPFILE | awk -F ":" '{ print $3 }'`
-
-[ -n ${quaggauid} ]    || (echo "No uid for quagga in ${PASSWDFILE}"   && /bin/false)
-[ -n ${quaggagid} ]    || (echo "No gid for quagga in ${GROUPFILE}"    && /bin/false)
-[ -n ${quaggaVTYgid} ] || (echo "No gid for quaggavty in ${GROUPFILE}" && /bin/false)
-
-chown -R ${quaggauid}:${quaggagid} /etc/quagga
-touch /etc/quagga/vtysh.conf
-chgrp ${quaggavtygid} /etc/quagga/vtysh*
-chmod 440 /etc/sudoers.d/quagga_sudoers
-chmod 644 /etc/quagga/*
-
-ENVIRONMENTFILE=/etc/environment
-if ! grep --quiet VTYSH_PAGER=/bin/cat ${ENVIRONMENTFILE}; then
-    echo "VTYSH_PAGER=/bin/cat"  >> ${ENVIRONMENTFILE}
-fi
-##################################################
-
-if [ -n "$DEBIAN_SCRIPT_DEBUG" ]; then set -v -x; DEBIAN_SCRIPT_TRACE=1; fi
-${DEBIAN_SCRIPT_TRACE:+ echo "#42#DEBUG# RUNNING $0 $*"}
-
-# This is most likely due to the answer "no" to the "really stop the server"
-# question in the prerm script.
-if [ "$1" = "abort-upgrade" ]; then
-  exit 0
-fi
-
-. /usr/share/debconf/confmodule
-
-db_stop
-
-#DEBHELPER#
-
diff --git a/debian/rules b/debian/rules
index b10081318..42c0d5f63 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,10 +20,10 @@ MAKEFLAGS += -j$(DEBIAN_JOBS)
 endif
 
 %:
-	dh $@ --with=systemd,autoreconf --parallel --dbg-package=quagga-dbg --list-missing
+	dh $@ --with=systemd,autoreconf --parallel --dbg-package=frr-dbg --list-missing
 
 override_dh_auto_configure:
-	# Quagga needs /proc to check some BSD vs Linux specific stuff.
+	# Frr needs /proc to check some BSD vs Linux specific stuff.
 	# Else it fails with an obscure error message pointing out that
 	# IPCTL_FORWARDING is an undefined symbol which is not very helpful.
 	@if ! [ -d /proc/1 ]; then \
@@ -33,18 +33,18 @@ override_dh_auto_configure:
 
 	if ! [ -e config.status ]; then \
 	dh_auto_configure -- \
-		--enable-exampledir=/usr/share/doc/quagga/examples/ \
-		--localstatedir=/var/run/quagga \
-		--sbindir=/usr/lib/quagga \
-		--sysconfdir=/etc/quagga \
+		--enable-exampledir=/usr/share/doc/frr/examples/ \
+		--localstatedir=/var/run/frr \
+		--sbindir=/usr/lib/frr \
+		--sysconfdir=/etc/frr \
 		$(USE_SNMP) \
 		--enable-ospfapi=yes \
 		--enable-vtysh=yes \
 		--enable-isisd=yes \
 		--enable-multipath=256 \
-		--enable-user=quagga \
-		--enable-group=quagga \
-		--enable-vty-group=quaggavty \
+		--enable-user=frr \
+		--enable-group=frr \
+		--enable-vty-group=frrvty \
 		--enable-configfile-mask=0640 \
 		--enable-logfile-mask=0640 \
 		--enable-werror \
@@ -53,7 +53,7 @@ override_dh_auto_configure:
 		--enable-systemd=yes \
 		--enable-poll=yes \
 		--enable-cumulus=yes \
-		--enable-pimd=no \
+		--enable-pimd=yes \
 		--enable-dependency-tracking \
 		--enable-bgp-vnc=no; \
 	fi
@@ -66,11 +66,11 @@ override_dh_auto_build:
 
 	# doc/ is a bit crazy
 ifeq ($(GENERATE_PDF), 1)
-	dh_auto_build -- -C doc quagga.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
+	dh_auto_build -- -C doc frr.pdf || true # pdfetex fails with exit code 1 but still produces a good looking .pdf
 endif
-	rm -vf doc/quagga.info
-	dh_auto_build -- -C doc quagga.info
-	rm -vf doc/quagga.info.html*
+	rm -vf doc/frr.info
+	dh_auto_build -- -C doc frr.info
+	rm -vf doc/frr.info.html*
 
 override_dh_auto_test:
 
@@ -81,18 +81,18 @@ override_dh_auto_install:
 	rm -f debian/tmp/usr/share/info/dir*
 
 	# install config files
-	mkdir -p debian/tmp/etc/quagga/
-	perl -pi -e 's#^!log file #!log file /var/log/quagga/#' debian/tmp/usr/share/doc/quagga/examples/*sample*
+	mkdir -p debian/tmp/etc/frr/
+	perl -pi -e 's#^!log file #!log file /var/log/frr/#' debian/tmp/usr/share/doc/frr/examples/*sample*
 
-	# installing the Quagga specific SNMP MIB
+	# installing the Frr specific SNMP MIB
 	install -D -m 644 ./zebra/GNOME-PRODUCT-ZEBRA-MIB debian/tmp/usr/share/snmp/mibs/GNOME-PRODUCT-ZEBRA-MIB
 
 	# cleaning .la files
 	sed -i "/dependency_libs/ s/'.*'/''/" debian/tmp/usr/lib/*.la
 
 override_dh_systemd_start:
-	dh_systemd_start quagga.service
+	dh_systemd_start frr.service
 
 override_dh_systemd_enable:
-	dh_systemd_enable quagga.service
+	dh_systemd_enable frr.service
 
diff --git a/debian/tests/control b/debian/tests/control
index 1993e371f..53fd537e2 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,3 +1,3 @@
 Tests: daemons
-Depends: quagga
+Depends: frr
 Restrictions: needs-root
diff --git a/debian/tests/daemons b/debian/tests/daemons
index 52c156a1d..ac35ecd95 100644
--- a/debian/tests/daemons
+++ b/debian/tests/daemons
@@ -1,21 +1,21 @@
 #!/bin/bash
 #---------------
-# Testing quagga
+# Testing frr
 #---------------
 set -e
 
 # modify config file to enable all daemons and copy config files
-CONFIG_FILE=/etc/quagga/daemons
+CONFIG_FILE=/etc/frr/daemons
 DAEMONS=("zebra" "bgpd" "ospfd" "ospf6d" "ripd" "ripngd" "isisd" "pimd")
 
 for daemon in "${DAEMONS[@]}"
 do
     sed -i -e "s/${daemon}=no/${daemon}=yes/g" $CONFIG_FILE
-    cp /usr/share/doc/quagga/examples/${daemon}.conf.sample /etc/quagga/${daemon}.conf
+    cp /usr/share/doc/frr/examples/${daemon}.conf.sample /etc/frr/${daemon}.conf
 done
 
-# reload quagga
-/etc/init.d/quagga restart > /dev/null 2>&1
+# reload frr
+/etc/init.d/frr restart > /dev/null 2>&1
 
 # check daemons
 for daemon in "${DAEMONS[@]}"
diff --git a/debian/watch b/debian/watch
index bc6d91dab..46ff1c7da 100644
--- a/debian/watch
+++ b/debian/watch
@@ -4,5 +4,5 @@
 # Site		Directory		Pattern			Version	Script
 version=3
 opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha|b|a)[\-\.]?\d*)$/$1~$2/ \
-    http://download.savannah.gnu.org/releases/quagga/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
+    http://download.savannah.gnu.org/releases/frr/quagga-(\d.*)\.(?:tgz|tar\.(?:gz|bz2|xz))
 # Bart Martens <bartm@debian.org>  Fri, 25 Jan 2013 06:38:53 +0000
diff --git a/debian/watchfrr.rc b/debian/watchfrr.rc
new file mode 100644
index 000000000..4110b8639
--- /dev/null
+++ b/debian/watchfrr.rc
@@ -0,0 +1,4 @@
+check process watchfrr with pidfile /var/run/frr/watchfrr.pid
+        start program = "/etc/init.d/frr start watchfrr" with timeout 120 seconds
+        stop program = "/etc/init.d/frr stop watchfrr"
+        if 3 restarts within 10 cycles then timeout
diff --git a/debian/watchquagga.rc b/debian/watchquagga.rc
deleted file mode 100644
index e3b6340dc..000000000
--- a/debian/watchquagga.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-check process watchquagga with pidfile /var/run/quagga/watchquagga.pid
-        start program = "/etc/init.d/quagga start watchquagga" with timeout 120 seconds
-        stop program = "/etc/init.d/quagga stop watchquagga"
-        if 3 restarts within 10 cycles then timeout
diff --git a/doc/.gitignore b/doc/.gitignore
index 66c43c73e..57c66cb4a 100644
--- a/doc/.gitignore
+++ b/doc/.gitignore
@@ -2,17 +2,17 @@ Makefile
 Makefile.in
 mdate-sh
 draft-zebra-00.txt
-quagga.info-*
+frr.info-*
 zebra.html
 defines.texi
 version.texi
 texinfo.tex
-quagga.html
-quagga.info
+frr.html
+frr.info
 *.pdf
 *.eps
-quagga.ps
-quagga.dvi
+frr.ps
+frr.dvi
 stamp-vti
 .nfs*
 *.aux
@@ -28,6 +28,8 @@ stamp-vti
 *.toc
 *.tp
 *.vr
+*.8
+*.1
 .arch-inventory
 .arch-ids
 *~
diff --git a/doc/Makefile.am b/doc/Makefile.am
index d5db6cf49..04389c63a 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -7,7 +7,7 @@
 #
 # Here we use 'convert' from the well known 'ImageMagick' package
 # to do conversion from png to eps/pdf for figures. 
-# PDF form is required for quagga.pdf, using PDFTex at least.
+# PDF form is required for frr.pdf, using PDFTex at least.
 #
 # TeX implementation, which we depend on already anyway.
 #
@@ -20,7 +20,7 @@ PNGTOPDF = $(PNGTOEPS)
 EPSTOPDF = epstopdf
 
 VNCFIGURES_PNG = 
-VNCFIGURES_DIA = -vnc-mesh -vnc-quagga-route-reflector		\
+VNCFIGURES_DIA = -vnc-mesh -vnc-frr-route-reflector		\
 -vnc-commercial-route-reflector -vnc-redundant-route-reflectors	\
 -vnc-gw -vnc-gw-rr
 
@@ -40,7 +40,7 @@ figures_eps = $(figures_names_parts:%=fig%.eps) $(VNCFIGURES_PNG:%.png=%.eps)
 figures_txt = $(figures_names_parts:%=fig%.txt)
 
 # rather twisted logic because we have to build PDFs of the EPS figures for
-# PDFTex and yet build one PDF, quagga.pdf, from texi source. Which means we
+# PDFTex and yet build one PDF, frr.pdf, from texi source. Which means we
 # cant rely on a single automatic rule for *.pdf, eg the one automatically
 # provided by automake. If you are an automake wizard, please feel free to
 # compact it somehow.
@@ -48,16 +48,16 @@ figures_txt = $(figures_names_parts:%=fig%.txt)
 # Built from defines.texi.in
 BUILT_SOURCES = defines.texi
 
-info_TEXINFOS = quagga.texi
+info_TEXINFOS = frr.texi
 
-# Have to manually specify the quagga.pdf rule in order to allow
+# Have to manually specify the frr.pdf rule in order to allow
 # us to have a generic automatic .pdf rule to build the figure sources
 # because it cant just work from the png's directly it seems - contrary
 # to the documentation...
-quagga.pdf: $(info_TEXINFOS) $(figures_pdf) $(quagga_TEXINFOS)
+frr.pdf: $(info_TEXINFOS) $(figures_pdf) $(frr_TEXINFOS)
 	$(TEXI2PDF) -o "$@" $< || true
 
-quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi isisd.texi filter.texi \
+frr_TEXINFOS = appendix.texi basic.texi bgpd.texi isisd.texi filter.texi \
 	vnc.texi \
 	install.texi ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi \
 	overview.texi protocol.texi ripd.texi ripngd.texi routemap.texi \
@@ -73,7 +73,7 @@ quagga_TEXINFOS = appendix.texi basic.texi bgpd.texi isisd.texi filter.texi \
 .dia.png:
 	$(DIATOPNG) "$@" $<
 
-man_MANS = quagga.1
+man_MANS = frr.1
 
 if PIMD
 man_MANS += pimd.8
@@ -115,8 +115,8 @@ if VTYSH
 man_MANS += vtysh.1
 endif
 
-if WATCHQUAGGA
-man_MANS += watchquagga.8
+if WATCHFRR
+man_MANS += watchfrr.8
 endif
 
 if ZEBRA
@@ -124,8 +124,21 @@ man_MANS += zebra.8
 endif
 
 EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt \
-	bgpd.8 isisd.8 ospf6d.8 ospfclient.8 ospfd.8 ldpd.8 ripd.8 \
-	ripngd.8 pimd.8 vtysh.1 watchquagga.8 zebra.8 quagga.1 \
+	\
+	bgpd.8.in \
+	isisd.8.in \
+	ospf6d.8.in \
+	ospfclient.8.in \
+	ospfd.8.in \
+	ldpd.8.in \
+	ripd.8.in \
+	ripngd.8.in \
+	pimd.8.in \
+	vtysh.1.in \
+	watchfrr.8.in \
+	zebra.8.in \
+	frr.1.in \
+	\
 	mpls/ChangeLog.opaque.txt mpls/cli_summary.txt \
 	mpls/opaque_lsa.txt mpls/ospfd.conf \
 	$(figures_sources) $(figures_png) $(figures_txt)
diff --git a/doc/basic.texi b/doc/basic.texi
index 4485665af..cea33eaa8 100644
--- a/doc/basic.texi
+++ b/doc/basic.texi
@@ -110,7 +110,7 @@ with severity @code{errors}.
 If you want to log into a file, please specify @code{filename} as
 in this example:
 @example
-log file /var/log/quagga/bgpd.log informational
+log file /var/log/frr/bgpd.log informational
 @end example
 If the optional second argument specifying the
 logging level is not present, the default logging level (typically debugging,
@@ -119,7 +119,7 @@ The @code{no} form of the command disables logging to a file.
 
 Note: if you do not configure any file logging, and a daemon crashes due
 to a signal or an assertion failure, it will attempt to save the crash
-information in a file named /var/tmp/quagga.<daemon name>.crashlog.
+information in a file named /var/tmp/frr.<daemon name>.crashlog.
 For security reasons, this will not happen if the file exists already, so
 it is important to delete the file after reporting the crash information.
 @end deffn
diff --git a/doc/bgpd.8 b/doc/bgpd.8.in
index 7e90eaec5..704774463 100644
--- a/doc/bgpd.8
+++ b/doc/bgpd.8.in
@@ -1,7 +1,6 @@
-.TH BGPD 8 "25 November 2004" "Quagga BGPD daemon" "Version 0.97.3"
+.TH BGPD 8 "25 November 2004" "@PACKAGE_FULLNAME@ BGPD daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-bgpd \- a BGPv4, BGPv4\+, BGPv4\- routing engine for use with Quagga routing
-software
+bgpd \- a BGPv4, BGPv4\+, BGPv4\- routing engine for use with @PACKAGE_FULLNAME@.
 
 .SH SYNOPSIS
 .B bgpd
@@ -32,7 +31,7 @@ software
 .SH DESCRIPTION
 .B bgpd 
 is a routing component that works with the 
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -44,10 +43,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/bgpd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/bgpd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -55,7 +54,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When bgpd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart bgpd.  The likely default is \fB\fI/var/run/bgpd.pid\fR.
+restart bgpd.  The default is \fB\fI@CFG_STATE@/bgpd.pid\fR.
 .TP
 \fB\-p\fR, \fB\-\-bgp_port \fR\fIbgp-port-number\fR
 Set the port that bgpd will listen to for bgp data.  
@@ -69,7 +68,7 @@ Specify the address that the bgpd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-r\fR, \fB\-\-retain\fR 
 When the program terminates, retain routes added by \fBbgpd\fR.
@@ -81,12 +80,12 @@ Skip setting the process effective user and group.
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/bgpd
+.BI @CFG_SBIN@/bgpd
 The default location of the 
 .B bgpd
 binary.
 .TP
-.BI /etc/quagga/bgpd.conf
+.BI @CFG_SYSCONF@/bgpd.conf
 The default location of the 
 .B bgpd
 config file.
@@ -98,7 +97,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBbgpd\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The bgpd process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBbgpd\fR supports many
@@ -114,11 +113,11 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B bgpd
 eats bugs for breakfast. If you have food for the maintainers try 
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/bgpd.texi b/doc/bgpd.texi
index 54bed102f..08cd4149a 100644
--- a/doc/bgpd.texi
+++ b/doc/bgpd.texi
@@ -1,9 +1,9 @@
 @c -*-texinfo-*-
-@c This is part of the Quagga Manual.
+@c This is part of the Frr Manual.
 @c @value{COPYRIGHT_STR}
 @c Portions: 
 @c   Copyright @copyright{} 2015 Hewlett Packard Enterprise Development LP
-@c See file quagga.texi for copying conditions.
+@c See file frr.texi for copying conditions.
 @node BGP
 @chapter BGP
 
@@ -114,7 +114,7 @@ This command set distance value to
 @node BGP decision process
 @subsection BGP decision process
 
-The decision process Quagga BGP uses to select routes is as follows:
+The decision process Frr BGP uses to select routes is as follows:
 
 @table @asis
 @item 1. Weight check
@@ -240,7 +240,7 @@ The BGP MED (Multi_Exit_Discriminator) attribute has properties which can
 cause subtle convergence problems in BGP.  These properties and problems
 have proven to be hard to understand, at least historically, and may still
 not be widely understood.  The following attempts to collect together and
-present what is known about MED, to help operators and Quagga users in
+present what is known about MED, to help operators and Frr users in
 designing and configuring their networks.
 
 The BGP @acronym{MED, Multi_Exit_Discriminator} attribute is intended to
@@ -263,7 +263,7 @@ MED values to those of AS X.  The MED values have been set by different
 administrators, with different frames of reference.
 
 The default behaviour of BGP therefore is to not compare MED values across
-routes received from different neighbouring ASes.  In Quagga this is done by
+routes received from different neighbouring ASes.  In Frr this is done by
 comparing the neighbouring, left-most AS in the received AS_PATHs of the
 routes and only comparing MED if those are the same.
 
@@ -341,7 +341,7 @@ in response to the most common sequence of received updates.
 
 A deterministic order of evaluation tends to imply an additional overhead of
 sorting over any set of n routes to a destination.  The implementation of
-deterministic MED in Quagga scales significantly worse than most sorting
+deterministic MED in Frr scales significantly worse than most sorting
 algorithms at present, with the number of paths to a given destination. 
 That number is often low enough to not cause any issues, but where there are
 many paths, the deterministic comparison may quickly become increasingly
@@ -408,7 +408,7 @@ preferences between the routes:
 This particular type of oscillation in full-mesh iBGP topologies can  be
 avoided by speakers preferring already selected, external routes rather than
 choosing to update to new a route based on a post-MED metric (e.g. 
-router-ID), at the cost of a non-deterministic selection process.  Quagga
+router-ID), at the cost of a non-deterministic selection process.  Frr
 implements this, as do many other implementations, so long as it is not
 overridden by setting @ref{bgp bestpath compare-routerid}, and see also
 @ref{BGP decision process}, .
@@ -480,7 +480,7 @@ with MED may be determined largely by the order that routes were received
 in.
 
 Setting this option will have a performance cost that may be noticeable when
-there are many routes for each destination.  Currently in Quagga it is
+there are many routes for each destination.  Currently in Frr it is
 implemented in a way that scales poorly as the number of routes per
 destination increases.
 
@@ -1478,11 +1478,11 @@ unicast neighbor, @command{bgpd} does not send these Capability
 Negotiation packets (at least not unless other optional BGP features
 require capability negotation).
 
-By default, Quagga will bring up peering with minimal common capability
+By default, Frr will bring up peering with minimal common capability
 for the both sides.  For example, local router has unicast and
 multicast capabilitie and remote router has unicast capability.  In
 this case, the local router will establish the connection with unicast
-only capability. When there are no common capabilities, Quagga sends
+only capability. When there are no common capabilities, Frr sends
 Unsupported Capability error and then resets the connection.
 
 If you want to completely match capabilities with remote peer.  Please
@@ -1588,10 +1588,10 @@ When bgp config-type cisco is specified,
 ``network'' and ``aggregate-address'' argument is displayed as
 ``A.B.C.D M.M.M.M''
 
-Quagga: network 10.0.0.0/8
+Frr: network 10.0.0.0/8
 Cisco: network 10.0.0.0
 
-Quagga: aggregate-address 192.168.0.0/24
+Frr: aggregate-address 192.168.0.0/24
 Cisco: aggregate-address 192.168.0.0 255.255.255.0
 
 Community attribute handling is also different.  If there is no
@@ -1615,7 +1615,7 @@ router bgp 1
 @end example
 
 @deffn {Command} {bgp config-type zebra} {}
-Quagga style BGP configuration.  This is default.
+Frr style BGP configuration.  This is default.
 @end deffn
 
 @node BGP instance and view
diff --git a/doc/defines.texi.in b/doc/defines.texi.in
index 5436f20c3..43d744293 100644
--- a/doc/defines.texi.in
+++ b/doc/defines.texi.in
@@ -10,7 +10,9 @@
 @set COPYRIGHT_STR Copyright @copyright{} @value{COPYRIGHT_YEAR} @value{AUTHORS}
 
 @c These may vary with installation environment.
-@set INSTALL_PREFIX_ETC /etc/quagga
-@set INSTALL_PREFIX_SBIN /usr/sbin
-@set INSTALL_PREFIX_STATE /var/run/quagga
+@set INSTALL_PREFIX_ETC @CFG_SYSCONF@
+@set INSTALL_PREFIX_SBIN @CFG_SBIN@
+@set INSTALL_PREFIX_STATE @CFG_STATE@
+@set INSTALL_USER @enable_user@
+@set INSTALL_GROUP @enable_group@
 @set INSTALL_VTY_GROUP @enable_vty_group@
diff --git a/doc/fig-vnc-quagga-route-reflector.dia b/doc/fig-vnc-frr-route-reflector.dia
index 634f0b17f..634f0b17f 100644
--- a/doc/fig-vnc-quagga-route-reflector.dia
+++ b/doc/fig-vnc-frr-route-reflector.dia
diff --git a/doc/fig-vnc-quagga-route-reflector.png b/doc/fig-vnc-frr-route-reflector.png
index 477052184..477052184 100644
--- a/doc/fig-vnc-quagga-route-reflector.png
+++ b/doc/fig-vnc-frr-route-reflector.png
diff --git a/doc/fig-vnc-quagga-route-reflector.txt b/doc/fig-vnc-frr-route-reflector.txt
index e69de29bb..e69de29bb 100644
--- a/doc/fig-vnc-quagga-route-reflector.txt
+++ b/doc/fig-vnc-frr-route-reflector.txt
diff --git a/doc/filter.texi b/doc/filter.texi
index 5a9a15ee9..a49404365 100644
--- a/doc/filter.texi
+++ b/doc/filter.texi
@@ -2,7 +2,7 @@
 @comment  node-name,  next,  previous,  up
 @chapter Filtering
 
-Quagga provides many very flexible filtering features.  Filtering is used
+Frr provides many very flexible filtering features.  Filtering is used
 for both input and output of the routing information.  Once filtering is
 defined, it can be applied in any direction.
 
diff --git a/doc/quagga.1 b/doc/frr.1.in
index 35e8b30bf..528358a8d 100644
--- a/doc/quagga.1
+++ b/doc/frr.1.in
@@ -1,45 +1,45 @@
-.TH Quagga 1 "27 July 2006" "Quagga Systemd Script" "Version 0.99.23.1"
+.TH Frr 1 "27 July 2006" "@PACKAGE_FULLNAME@ Systemd Script" "Version @PACKAGE_VERSION@"
 .SH NAME
-quagga \- a systemd interaction script
+frr \- a systemd interaction script
 .SH SYNOPSIS
-.B quagga
+.B frr
 [
 .B start
 ]
 .br
-.B quagga
+.B frr
 [
 .B stop
 ]
 .br
-.B quagga
+.B frr
 [
 .B reload
 ]
 .br
-.B quagga
+.B frr
 [
 .B restart
 ]
 .br
-.B quagga
+.B frr
 [
 .B status
 ]
 .br
 .SH DESCRIPTION
-.B Quagga
+.B @PACKAGE_NAME@
 is a systemd interaction script for the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
-.B quagga
+.B frr
 command:
 .IP start
-Start enabled Quagga daemons
+Start enabled Frr daemons
 .IP stop
-Stop enabled Quagga daemons
+Stop enabled Frr daemons
 .IP reload
 Reload modified configuration files
 .IP restart
@@ -55,11 +55,11 @@ Status of all the daemons
 .BR isisd (8),
 .BR zebra (8)
 .SH BUGS
-.B quagga
+.B frr
 eats bugs for breakfast. If you have food for the maintainers try 
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/quagga.texi b/doc/frr.texi
index 13b885b69..360acebe1 100644
--- a/doc/quagga.texi
+++ b/doc/frr.texi
@@ -4,10 +4,10 @@
 @include defines.texi
 
 @c %**start of header
-@setfilename quagga.info
+@setfilename frr.info
 @c Set variables - sourced from defines.texi
 @include defines.texi
-@settitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}}
+@settitle @uref{http://www.freerangerouting.net,,@value{PACKAGE_NAME}}
 @c %**end of header
 
 @c automake will automatically generate version.texi
@@ -38,26 +38,26 @@ approved by Kunihiro Ishiguro.
 @c Info entry
 @dircategory Routing Software:
 @direntry
-* @value{PACKAGE_NAME}: (quagga).		The Quagga Software Routing Suite
+* @value{PACKAGE_NAME}: (frr).		The Frr Suite
 @end direntry
 
 @c @smallbook
 
 @ifinfo
-This file documents the Quagga Software Routing Suite which manages common
+This file documents the Frr Software Routing Suite which manages common
 TCP/IP routing protocols.
 
 This is Edition @value{EDITION}, last updated @value{UPDATED} of
-@cite{The Quagga Manual}, for @uref{http://www.quagga.net/,,@value{PACKAGE_NAME}}
+@cite{The Frr Manual}, for @uref{http://www.freerangerouting.net/,,@value{PACKAGE_NAME}}
 Version @value{VERSION}.
 
 @insertcopying
 @end ifinfo
 
 @titlepage
-@title @uref{http://www.quagga.net,,Quagga}
+@title @uref{http://www.freerangerouting.net,,Frr}
 @subtitle A routing software package for TCP/IP networks
-@subtitle @uref{http://www.quagga.net,,@value{PACKAGE_NAME}} @value{VERSION}
+@subtitle @uref{http://www.freerangerouting.net,,@value{PACKAGE_NAME}} @value{VERSION}
 @subtitle @value{UPDATED-MONTH}
 @author @value{AUTHORS}
 
@@ -70,12 +70,12 @@ Version @value{VERSION}.
 
 @ifnottex
 @node Top
-@top Quagga -- With Virtual Network Control
+@top Frr -- With Virtual Network Control
 		     
-@uref{http://www.quagga.net,,Quagga} is an advanced routing software package
+@uref{http://www.freerangerouting.net,,Frr} is an advanced routing software package
 that provides a suite of TCP/IP based routing protocols.  This is the Manual
-for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of 
-@uref{http://www.zebra.org,,GNU Zebra}.
+for @value{PACKAGE_STRING}. @uref{http://www.freerangerouting.net,,Frr} is a fork of 
+@uref{http://www.quagga.net,,Quagga}.
 
 @insertcopying
 @end ifnottex
@@ -91,7 +91,7 @@ for @value{PACKAGE_STRING}. @uref{http://www.quagga.net,,Quagga} is a fork of
 * OSPFv3::
 * ISIS::
 * BGP::
-* Configuring Quagga as a Route Server::
+* Configuring Frr as a Route Server::
 * VNC and VNC-GW::
 * VTY shell::
 * Filtering::
diff --git a/doc/install.texi b/doc/install.texi
index 3ace7d6a0..8c501ed45 100644
--- a/doc/install.texi
+++ b/doc/install.texi
@@ -1,11 +1,11 @@
 @node  Installation
 @chapter Installation
 
-@cindex How to install Quagga
+@cindex How to install Frr
 @cindex Installation
-@cindex Installing Quagga
+@cindex Installing Frr
 @cindex Building the system
-@cindex Making Quagga
+@cindex Making Frr
 
 There are three steps for installing the software: configuration,
 compilation, and installation.
@@ -16,7 +16,7 @@ compilation, and installation.
 * Install the Software::
 @end menu
 
-The easiest way to get Quagga running is to issue the following
+The easiest way to get Frr running is to issue the following
 commands:
 
 @example
@@ -43,7 +43,7 @@ commands:
 @cindex Distribution configuration
 @cindex Options to @code{./configure}
  
-Quagga has an excellent configure script which automatically detects most
+Frr has an excellent configure script which automatically detects most
 host configurations.  There are several additional configure options to
 customize the build to include or exclude specific features and dependencies.
 
@@ -122,13 +122,13 @@ This command will configure zebra and the routing daemons.
 @node Least-Privilege support
 @subsection Least-Privilege support
 
-@cindex Quagga Least-Privileges
-@cindex Quagga Privileges
+@cindex Frr Least-Privileges
+@cindex Frr Privileges
 
 Additionally, you may configure zebra to drop its elevated privileges
 shortly after startup and switch to another user. The configure script will
 automatically try to configure this support. There are three configure
-options to control the behaviour of Quagga daemons.
+options to control the behaviour of Frr daemons.
 
 @table @option
 @item --enable-user=@var{user}
@@ -145,29 +145,29 @@ delegate this group to individual users, or to run vtysh setgid to
 this group.
 @end table
 
-The default user and group which will be configured is 'quagga' if no user
+The default user and group which will be configured is 'frr' if no user
 or group is specified. Note that this user or group requires write access to
 the local state directory (see --localstatedir) and requires at least read
 access, and write access if you wish to allow daemons to write out their
 configuration, to the configuration directory (see --sysconfdir).
 
 On systems which have the 'libcap' capabilities manipulation library
-(currently only linux), the quagga system will retain only minimal
+(currently only linux), the frr system will retain only minimal
 capabilities required, further it will only raise these capabilities for
-brief periods. On systems without libcap, quagga will run as the user
+brief periods. On systems without libcap, frr will run as the user
 specified and only raise its uid back to uid 0 for brief periods.
 
 @node Linux notes
 @subsection Linux Notes
 
-@cindex Configuring Quagga
+@cindex Configuring Frr
 @cindex Building on Linux boxes
 @cindex Linux configurations
 
 There are several options available only to @sc{gnu}/Linux systems:
 @footnote{@sc{gnu}/Linux has very flexible kernel configuration features}.  If
 you use @sc{gnu}/Linux, make sure that the current kernel configuration is
-what you want.  Quagga will run with any kernel configuration but some
+what you want.  Frr will run with any kernel configuration but some
 recommendations do exist.
 
 @table @var
@@ -190,7 +190,7 @@ This option should be specified when you use @command{ripd} (@pxref{RIP}) or
 @end table
 
 IPv6 support has been added in @sc{gnu}/Linux kernel version 2.2.  If you
-try to use the Quagga IPv6 feature on a @sc{gnu}/Linux kernel, please
+try to use the Frr IPv6 feature on a @sc{gnu}/Linux kernel, please
 make sure the following libraries have been installed.  Please note that
 these libraries will not be needed when you uses @sc{gnu} C library 2.1
 or upper.
@@ -244,7 +244,7 @@ programs and supporting files to a standard location. After the
 installation process has completed, these files have been copied
 from your work directory to @file{/usr/local/bin}, and @file{/usr/local/etc}.
 
-To install the Quagga suite, issue the following command at your shell
+To install the Frr suite, issue the following command at your shell
 prompt: @command{make install}.
 
 @example
@@ -253,7 +253,7 @@ prompt: @command{make install}.
 %
 @end example
 
-Quagga daemons have their own terminal interface or VTY.  After
+Frr daemons have their own terminal interface or VTY.  After
 installation, you have to setup each beast's port number to connect to
 them.  Please add the following entries to @file{/etc/services}.
 
diff --git a/doc/ipv6.texi b/doc/ipv6.texi
index e08759ab0..859f6a960 100644
--- a/doc/ipv6.texi
+++ b/doc/ipv6.texi
@@ -1,14 +1,14 @@
 @node IPv6 Support
 @chapter IPv6 Support
 
-Quagga fully supports IPv6 routing.  As described so far, Quagga supports
+Frr fully supports IPv6 routing.  As described so far, Frr supports
 RIPng, OSPFv3, and BGP-4+.  You can give IPv6 addresses to an interface
-and configure static IPv6 routing information.  Quagga IPv6 also provides
+and configure static IPv6 routing information.  Frr IPv6 also provides
 automatic address configuration via a feature called @code{address
 auto configuration}.  To do it, the router must send router advertisement
 messages to the all nodes that exist on the network.
 
-Previous versions of Quagga could be built without IPv6 support.  This is
+Previous versions of Frr could be built without IPv6 support.  This is
 no longer possible.
 
 @menu
diff --git a/doc/isisd.8 b/doc/isisd.8.in
index 83ac99d57..9ffcbc618 100644
--- a/doc/isisd.8
+++ b/doc/isisd.8.in
@@ -1,6 +1,6 @@
-.TH IS-IS 8 "25 November 2004" "Quagga IS-IS daemon" "Version 0.97.3"
+.TH IS-IS 8 "25 November 2004" "@PACKAGE_FULLNAME@ IS-IS daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-isisd \- an IS-IS routing engine for use with Quagga routing software.
+isisd \- an IS-IS routing engine for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B isisd
 [
@@ -27,7 +27,7 @@ isisd \- an IS-IS routing engine for use with Quagga routing software.
 .SH DESCRIPTION
 .B isisd
 is a routing component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -39,10 +39,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/isisd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/isisd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -50,7 +50,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When isisd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart isisd.  The likely default is \fB\fI/var/run/isisd.pid\fR.
+restart isisd.  The default is \fB\fI@CFG_STATE@/isisd.pid\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the isisd VTY will listen on. This defaults to
@@ -61,18 +61,18 @@ Specify the address that the isisd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/isisd
+.BI @CFG_SBIN@/isisd
 The default location of the 
 .B isisd
 binary.
 .TP
-.BI /etc/quagga/isisd.conf
+.BI @CFG_SYSCONF@/isisd.conf
 The default location of the 
 .B isisd
 config file.
@@ -84,7 +84,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBisisd\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The isisd process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBisisd\fR supports many
@@ -103,7 +103,7 @@ production use.
 
 .B isisd
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://isisd.sourceforge.net
diff --git a/doc/kernel.texi b/doc/kernel.texi
index 67fbb5e36..e58ade5a8 100644
--- a/doc/kernel.texi
+++ b/doc/kernel.texi
@@ -31,7 +31,7 @@ information.
 @item netlink
 On recent Linux kernels (2.0.x and 2.2.x), there is a kernel/user
 communication support called @code{netlink}.  It makes asynchronous
-communication between kernel and Quagga possible, similar to a routing
+communication between kernel and Frr possible, similar to a routing
 socket on BSD systems.
 
 Before you use this feature, be sure to select (in kernel configuration) 
@@ -41,7 +41,7 @@ the kernel/netlink support option 'Kernel/User network link driver' and
 Today, the /dev/route special device file is obsolete.  Netlink
 communication is done by reading/writing over netlink socket.
 
-After the kernel configuration, please reconfigure and rebuild Quagga.
-You can use netlink as a dynamic routing update channel between Quagga
+After the kernel configuration, please reconfigure and rebuild Frr.
+You can use netlink as a dynamic routing update channel between Frr
 and the kernel.
 @end table
diff --git a/doc/ldpd-basic-test-setup.md b/doc/ldpd-basic-test-setup.md
index e5e987f9e..b25a2b6d4 100644
--- a/doc/ldpd-basic-test-setup.md
+++ b/doc/ldpd-basic-test-setup.md
@@ -103,7 +103,7 @@ just to show how the VPLS configuration should look like in the future.
 # ip -6 route add 3:3:3::3/128 via 2001:db8:4::3
 ```
 
-6 - Edit /etc/quagga/ospfd.conf:
+6 - Edit /etc/frr/ospfd.conf:
 ```
 router ospf
  network 4.4.4.4/32 area 0.0.0.0
@@ -112,7 +112,7 @@ router ospf
 !
 ```
 
-7 - Edit /etc/quagga/ldpd.conf:
+7 - Edit /etc/frr/ldpd.conf:
 ```
 debug mpls ldp messages recv
 debug mpls ldp messages sent
@@ -207,7 +207,7 @@ LDPv6 but the IOS-XR implementation is not RFC compliant in this regard.
 # route -n add 2:2:2::2/128 2001:db8:2::2
 ```
 
-6 - Edit /etc/quagga/ospfd.conf:
+6 - Edit /etc/frr/ospfd.conf:
 ```
 router ospf
  network 10.0.2.3/24 area 0
@@ -216,7 +216,7 @@ router ospf
 !
 ```
 
-7 - Edit /etc/quagga/ldpd.conf:
+7 - Edit /etc/frr/ldpd.conf:
 ```
 debug mpls ldp messages recv
 debug mpls ldp messages sent
diff --git a/doc/ldpd.8 b/doc/ldpd.8.in
index 092ff39d4..1683de46c 100644
--- a/doc/ldpd.8
+++ b/doc/ldpd.8.in
@@ -1,6 +1,6 @@
-.TH LDPD 8 "29 March 2016" "Quagga LDP daemon" "Version 1.0.20160309"
+.TH LDPD 8 "29 March 2016" "@PACKAGE_FULLNAME@ LDP daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-ldpd \- an LDP engine for use with Quagga routing software.
+ldpd \- an LDP engine for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B ldpd
 [
@@ -27,7 +27,7 @@ ldpd \- an LDP engine for use with Quagga routing software.
 .SH DESCRIPTION
 .B ldpd
 is a component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -39,10 +39,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/ldpd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/ldpd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -50,7 +50,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When ldpd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart ldpd.  The likely default is \fB\fI/var/run/ldpd.pid\fR.
+restart ldpd.  The default is \fB\fI@CFG_STATE@/ldpd.pid\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the ldpd VTY will listen on. This defaults to
@@ -61,18 +61,18 @@ Specify the address that the ldpd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/local/sbin/ldpd
+.BI @CFG_SBIN@/ldpd
 The default location of the 
 .B ldpd
 binary.
 .TP
-.BI /usr/local/etc/ldpd.conf
+.BI @CFG_SYSCONF@/ldpd.conf
 The default location of the 
 .B ldpd
 config file.
@@ -84,7 +84,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBldpd\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The ldpd process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBldpd\fR supports many
@@ -101,9 +101,9 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B ldpd
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/main.texi b/doc/main.texi
index 5302c9687..2e5045762 100644
--- a/doc/main.texi
+++ b/doc/main.texi
@@ -258,7 +258,7 @@ addresses but unicast addresses.
 This table is fully separate from the default unicast table.  However,
 RPF lookup can include the unicast table.
 
-WARNING: RPF lookup results are non-responsive in this version of Quagga,
+WARNING: RPF lookup results are non-responsive in this version of Frr,
 i.e. multicast routing does not actively react to changes in underlying
 unicast topology!
 
@@ -330,7 +330,7 @@ Multicast RIB instead of the Unicast RIB.
 @node zebra Route Filtering
 @section zebra Route Filtering
 Zebra supports @command{prefix-list} and @command{route-map} to match
-routes received from other quagga components.  The
+routes received from other frr components.  The
 @command{permit}/@command{deny} facilities provided by these commands
 can be used to filter which routes zebra will install in the kernel.
 
@@ -374,16 +374,16 @@ ip protocol rip route-map RM1
 @section zebra FIB push interface
 
 Zebra supports a 'FIB push' interface that allows an external
-component to learn the forwarding information computed by the Quagga
+component to learn the forwarding information computed by the Frr
 routing suite.
 
-In Quagga, the Routing Information Base (RIB) resides inside
+In Frr, the Routing Information Base (RIB) resides inside
 zebra. Routing protocols communicate their best routes to zebra, and
 zebra computes the best route across protocols for each prefix. This
 latter information makes up the Forwarding Information Base
 (FIB). Zebra feeds the FIB to the kernel, which allows the IP stack in
 the kernel to forward packets according to the routes computed by
-Quagga. The kernel FIB is updated in an OS-specific way. For example,
+Frr. The kernel FIB is updated in an OS-specific way. For example,
 the @code{netlink} interface is used on Linux, and route sockets are
 used on FreeBSD.
 
@@ -408,7 +408,7 @@ interaction of zebra with the kernel remains unchanged -- that is, the
 kernel continues to receive FIB updates as before.
 
 The encapsulation header for the messages exchanged with the FPM is
-defined by the file @file{fpm/fpm.h} in the quagga tree. The routes
+defined by the file @file{fpm/fpm.h} in the frr tree. The routes
 themselves are encoded in netlink or protobuf format, with netlink
 being the default.
 
diff --git a/doc/next-hop-tracking.txt b/doc/next-hop-tracking.txt
index d157866e8..d64433e2f 100644
--- a/doc/next-hop-tracking.txt
+++ b/doc/next-hop-tracking.txt
@@ -1,7 +1,7 @@
 0. Introduction
 
 This is the design specification for next hop tracking feature in
-Quagga.
+Frr.
 
 1. Background
 
@@ -259,7 +259,7 @@ rnh table:
 
 5. User interface changes
 
-quagga# show ip nht
+frr# show ip nht
 3.3.3.3
  resolved via kernel
  via 11.0.0.6, swp1
@@ -277,7 +277,7 @@ quagga# show ip nht
  via 10.0.1.2, eth0
  Client list: bgp(fd 12)
 
-quagga# show ip bgp nexthop
+frr# show ip bgp nexthop
 Current BGP nexthop cache:
  3.3.3.3 valid [IGP metric 0], #paths 3
   Last update: Wed Oct 16 04:43:49 2013
@@ -291,11 +291,11 @@ Current BGP nexthop cache:
  11.11.11.11 valid [IGP metric 0], #paths 1
   Last update: Wed Oct 16 04:43:47 2013
 
-quagga# show ipv6 nht
-quagga# show ip bgp nexthop detail
+frr# show ipv6 nht
+frr# show ip bgp nexthop detail
 
-quagga# debug bgp nht
-quagga# debug zebra nht
+frr# debug bgp nht
+frr# debug zebra nht
 
 6. Sample test cases
 
diff --git a/doc/ospf6d.8 b/doc/ospf6d.8.in
index 630b20afd..7f94782be 100644
--- a/doc/ospf6d.8
+++ b/doc/ospf6d.8.in
@@ -1,6 +1,6 @@
-.TH OSPF6D 8 "25 November 2004" "Quagga OSPFv3 daemon" "Version 0.97.3"
+.TH OSPF6D 8 "25 November 2004" "@PACKAGE_FULLNAME@ OSPFv3 daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-ospf6d \- an OSPFv3 routing engine for use with Quagga routing software.
+ospf6d \- an OSPFv3 routing engine for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B ospf6d
 [
@@ -27,7 +27,7 @@ ospf6d \- an OSPFv3 routing engine for use with Quagga routing software.
 .SH DESCRIPTION
 .B ospf6d
 is a routing component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -40,10 +40,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/ospf6d.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/ospf6d.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -51,7 +51,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When ospf6d starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart ospf6d.  The likely default is \fB\fI/var/run/ospf6d.pid\fR.
+restart ospf6d.  The default is \fB\fI@CFG_STATE@/ospf6d.pid\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the ospf6d VTY will listen on. This defaults to
@@ -62,18 +62,18 @@ Specify the address that the ospf6d VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/ospf6d
+.BI @CFG_SBIN@/ospf6d
 The default location of the 
 .B ospf6d
 binary.
 .TP
-.BI /etc/quagga/ospf6d.conf
+.BI @CFG_SYSCONF@/ospf6d.conf
 The default location of the 
 .B ospf6d
 config file.
@@ -85,7 +85,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBospf6d\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The ospf6d process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBospf6d\fR supports many
@@ -101,11 +101,11 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B ospf6d
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ospfclient.8 b/doc/ospfclient.8.in
index ccfad1aad..fb996a541 100644
--- a/doc/ospfclient.8
+++ b/doc/ospfclient.8.in
@@ -39,4 +39,4 @@ Area in the IP address format for type 10, otherwise it will be ignored.
 .SH "SEE ALSO"
 .BR ospfd (8).
 .SH AUTHORS
-See the project homepage at <http://www.quagga.net/>.
+See the project homepage at <@PACKAGE_URL@>.
diff --git a/doc/ospfd.8 b/doc/ospfd.8.in
index ba8848aff..1b86551ca 100644
--- a/doc/ospfd.8
+++ b/doc/ospfd.8.in
@@ -1,6 +1,6 @@
-.TH OSPFD 8 "25 November 2004" "Quagga OSPFv2 daemon" "Version 0.97.3"
+.TH OSPFD 8 "25 November 2004" "@PACKAGE_FULLNAME@ OSPFv2 daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-ospfd \- an OSPFv2 routing engine for use with Quagga routing software.
+ospfd \- an OSPFv2 routing engine for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B ospfd
 [
@@ -27,7 +27,7 @@ ospfd \- an OSPFv2 routing engine for use with Quagga routing software.
 .SH DESCRIPTION
 .B ospfd
 is a routing component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -39,10 +39,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/ospfd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/ospfd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -50,7 +50,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When ospfd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart ospfd.  The likely default is \fB\fI/var/run/ospfd.pid\fR.
+restart ospfd.  The default is \fB\fI@CFG_STATE@/ospfd.pid\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the ospfd VTY will listen on. This defaults to
@@ -61,7 +61,7 @@ Specify the address that the ospfd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-a\fR, \fB\-\-apiserver \fR
 Enable OSPF apiserver. Default is disabled.
@@ -70,12 +70,12 @@ Enable OSPF apiserver. Default is disabled.
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/ospfd
+.BI @CFG_SBIN@/ospfd
 The default location of the 
 .B ospfd
 binary.
 .TP
-.BI /etc/quagga/ospfd.conf
+.BI @CFG_SYSCONF@/ospfd.conf
 The default location of the 
 .B ospfd
 config file.
@@ -87,7 +87,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBospfd\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The ospfd process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBospfd\fR supports many
@@ -103,11 +103,11 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B ospfd
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ospfd.texi b/doc/ospfd.texi
index 7b9df8e78..7ff78e67c 100644
--- a/doc/ospfd.texi
+++ b/doc/ospfd.texi
@@ -77,7 +77,7 @@ which still can reach the backbone - this restriction exists primarily
 to ensure routing-loops are avoided.
 
 With the "Cisco" or "IBM" ABR type, the default in this release of
-Quagga, this restriction is lifted, allowing an ABR to consider
+Frr, this restriction is lifted, allowing an ABR to consider
 summaries learnt from other ABRs through non-backbone areas, and hence
 route via non-backbone areas as a last resort when, and only when,
 backbone links are down.
@@ -169,7 +169,7 @@ calculations will always be seperated by between 400ms to 10s, the
 hold-time increasing by 400ms each time an SPF-triggering event occurs
 within the hold-time of the previous SPF calculation.
 
-This command supercedes the @command{timers spf} command in previous Quagga
+This command supercedes the @command{timers spf} command in previous Frr
 releases.
 @end deffn
 
@@ -259,7 +259,7 @@ Summarize intra area paths from specified area into one Type-3 summary-LSA
 announced to other areas. This command can be used only in ABR and ONLY
 router-LSAs (Type-1) and network-LSAs (Type-2) (ie. LSAs with scope area) can
 be summarized. Type-5 AS-external-LSAs can't be summarized - their scope is AS.
-Summarizing Type-7 AS-external-LSAs isn't supported yet by Quagga.
+Summarizing Type-7 AS-external-LSAs isn't supported yet by Frr.
 
 @example
 @group
@@ -784,7 +784,7 @@ of networks between the areas:
 @group
 !
 password ABCDEF
-log file /var/log/quagga/ospfd.log
+log file /var/log/frr/ospfd.log
 service advanced-vty
 !
 interface eth0
diff --git a/doc/overview.texi b/doc/overview.texi
index 2301c4b7f..d1e8ea48b 100644
--- a/doc/overview.texi
+++ b/doc/overview.texi
@@ -2,73 +2,73 @@
 @chapter Overview
 @cindex Overview
 
-  @uref{http://www.quagga.net,,Quagga} is a routing software package that
+  @uref{http://www.freerangerouting.net,,Frr} is a routing software package that
 provides TCP/IP based routing services with routing protocols support such
 as RIPv1, RIPv2, RIPng, OSPFv2, OSPFv3, IS-IS, BGP-4, and BGP-4+ (@pxref{Supported
-RFCs}). Quagga also supports special BGP Route Reflector and Route Server
-behavior.  In addition to traditional IPv4 routing protocols, Quagga also
+RFCs}). Frr also supports special BGP Route Reflector and Route Server
+behavior.  In addition to traditional IPv4 routing protocols, Frr also
 supports IPv6 routing protocols.  With SNMP daemon which supports SMUX and AgentX
-protocol, Quagga provides routing protocol MIBs (@pxref{SNMP Support}).
+protocol, Frr provides routing protocol MIBs (@pxref{SNMP Support}).
 
-  Quagga uses an advanced software architecture to provide you with a high
-quality, multi server routing engine. Quagga has an interactive user
+  Frr uses an advanced software architecture to provide you with a high
+quality, multi server routing engine. Frr has an interactive user
 interface for each routing protocol and supports common client commands. 
-Due to this design, you can add new protocol daemons to Quagga easily.  You
-can use Quagga library as your program's client user interface.
+Due to this design, you can add new protocol daemons to Frr easily.  You
+can use Frr library as your program's client user interface.
 
-  Quagga is distributed under the @sc{gnu} General Public License.
+  Frr is distributed under the @sc{gnu} General Public License.
 
 @menu
-* About Quagga::                Basic information about Quagga
-* System Architecture::         The Quagga system architecture
+* About Frr::                Basic information about Frr
+* System Architecture::         The Frr system architecture
 * Supported Platforms::         Supported platforms and future plans
 * Supported RFCs::               Supported RFCs
-* How to get Quagga::            
+* How to get Frr::            
 * Mailing List::                Mailing list information
 * Bug Reports::                 Mail address for bug data
 @end menu
 
-@node About Quagga
+@node About Frr
 @comment  node-name,  next,  previous,  up
-@section About Quagga
-@cindex About Quagga
+@section About Frr
+@cindex About Frr
 
   Today, TCP/IP networks are covering all of the world.  The Internet has
 been deployed in many countries, companies, and to the home.  When you
 connect to the Internet your packet will pass many routers which have TCP/IP
 routing functionality.
 
-  A system with Quagga installed acts as a dedicated router.  With Quagga,
+  A system with Frr installed acts as a dedicated router.  With Frr,
 your machine exchanges routing information with other routers using routing
-protocols.  Quagga uses this information to update the kernel routing table
+protocols.  Frr uses this information to update the kernel routing table
 so that the right data goes to the right place.  You can dynamically change
-the configuration and you may view routing table information from the Quagga
+the configuration and you may view routing table information from the Frr
 terminal interface.
 
-  Adding to routing protocol support, Quagga can setup interface's flags,
+  Adding to routing protocol support, Frr can setup interface's flags,
 interface's address, static routes and so on.  If you have a small network,
-or a stub network, or xDSL connection, configuring the Quagga routing
+or a stub network, or xDSL connection, configuring the Frr routing
 software is very easy.  The only thing you have to do is to set up the
 interfaces and put a few commands about static routes and/or default routes. 
 If the network is rather large, or if the network structure changes
-frequently, you will want to take advantage of Quagga's dynamic routing
+frequently, you will want to take advantage of Frr's dynamic routing
 protocol support for protocols such as RIP, OSPF, IS-IS or BGP.
 
   Traditionally, UNIX based router configuration is done by
 @command{ifconfig} and @command{route} commands.  Status of routing
 table is displayed by @command{netstat} utility.  Almost of these commands
-work only if the user has root privileges.  Quagga has a different system
-administration method.  There are two user modes in Quagga.  One is normal
+work only if the user has root privileges.  Frr has a different system
+administration method.  There are two user modes in Frr.  One is normal
 mode, the other is enable mode.  Normal mode user can only view system
 status, enable mode user can change system configuration.  This UNIX account
 independent feature will be great help to the router administrator.
 
-  Currently, Quagga supports common unicast routing protocols, that is BGP,
+  Currently, Frr supports common unicast routing protocols, that is BGP,
 OSPF, RIP and IS-IS.  Upcoming for MPLS support, an implementation of LDP is
 currently being prepared for merging.  Implementations of BFD and PIM-SSM
 (IPv4) also exist, but are not actively being worked on.
 
-  The ultimate goal of the Quagga project is making a productive, quality, free
+  The ultimate goal of the Frr project is making a productive, quality, free
 TCP/IP routing software package.
 
 @node System Architecture
@@ -79,7 +79,7 @@ TCP/IP routing software package.
 @cindex Software internals
 
   Traditional routing software is made as a one process program which
-provides all of the routing protocol functionalities.  Quagga takes a
+provides all of the routing protocol functionalities.  Frr takes a
 different approach.  It is made from a collection of several daemons that
 work together to build the routing table.  There may be several
 protocol-specific routing daemons and zebra the kernel routing manager.
@@ -110,7 +110,7 @@ architecture creates new possibilities for the routing system.
 |                              |
 +------------------------------+
 
-    Quagga System Architecture
+    Frr System Architecture
 @end group
 @end example
 
@@ -120,11 +120,11 @@ and terminal interfaces.  Each daemon has it's own configuration file and
 terminal interface.  When you configure a static route, it must be done in
 @command{zebra} configuration file.  When you configure BGP network it must
 be done in @command{bgpd} configuration file.  This can be a very annoying
-thing.  To resolve the problem, Quagga provides integrated user interface
+thing.  To resolve the problem, Frr provides integrated user interface
 shell called @command{vtysh}.  @command{vtysh} connects to each daemon with
 UNIX domain socket and then works as a proxy for user input.
 
-Quagga was planned to use multi-threaded mechanism when it runs with a
+Frr was planned to use multi-threaded mechanism when it runs with a
 kernel that supports multi-threads.  But at the moment, the thread library
 which comes with @sc{gnu}/Linux or FreeBSD has some problems with running
 reliable services such as routing software, so we don't use threads at all. 
@@ -136,18 +136,18 @@ events.
 @section Supported Platforms
 
 @cindex Supported platforms
-@cindex Quagga on other systems
+@cindex Frr on other systems
 @cindex Compatibility with other systems
-@cindex Operating systems that support Quagga
+@cindex Operating systems that support Frr
 
-Currently Quagga supports @sc{gnu}/Linux and BSD. Porting Quagga
+Currently Frr supports @sc{gnu}/Linux and BSD. Porting Frr
 to other platforms is not too difficult as platform dependent code should
 most be limited to the @command{zebra} daemon.  Protocol daemons are mostly
-platform independent. Please let us know when you find out Quagga runs on a
+platform independent. Please let us know when you find out Frr runs on a
 platform which is not listed below.
 
 The list of officially supported platforms are listed below. Note that
-Quagga may run correctly on other platforms, and may run with partial
+Frr may run correctly on other platforms, and may run with partial
 functionality on further platforms.
 
 @sp 1
@@ -176,7 +176,7 @@ Mac OSX
 @end itemize
 
 Also note that, in particular regarding proprietary platforms, compiler
-and C library choice will affect Quagga.  Only recent versions of the
+and C library choice will affect Frr.  Only recent versions of the
 following C compilers are well-tested:
 
 @sp 1
@@ -269,39 +269,39 @@ November 1995.}
 
 @end table
 
-@node How to get Quagga
+@node How to get Frr
 @comment  node-name,  next,  previous,  up
-@section How to get Quagga
+@section How to get Frr
 
-The official Quagga web-site is located at:
+The official Frr web-site is located at:
 
-@uref{http://www.quagga.net/}
+@uref{http://www.freerangerouting.net/}
 
 and contains further information, as well as links to additional
 resources. 
 
-@uref{http://www.quagga.net/,Quagga} is a fork of GNU Zebra, whose
+@uref{http://www.freerangerouting.net/,Frr} is a fork of Quagga, whose
 web-site is located at:
 
-@uref{http://www.zebra.org/}.
+@uref{http://www.quagga.net/}.
 
 @node Mailing List
 @comment  node-name,  next,  previous,  up
 @section Mailing List
-@cindex How to get in touch with Quagga
-@cindex Mailing Quagga
+@cindex How to get in touch with Frr
+@cindex Mailing Frr
 @cindex Contact information
 @cindex Mailing lists
 
-There is a mailing list for discussions about Quagga.  If you have any
-comments or suggestions to Quagga, please subscribe to:
+There is a mailing list for discussions about Frr.  If you have any
+comments or suggestions to Frr, please subscribe to:
 
-@uref{http://lists.quagga.net/mailman/listinfo/quagga-users}.
+@uref{http://lists.nox.tf/listinfo/frr-users}.
 
-The @uref{http://www.quagga.net/,,Quagga} site has further information on
+The @uref{http://www.freerangerouting.net/,,Frr} site has further information on
 the available mailing lists, see:
 
-	@uref{http://www.quagga.net/lists.php}
+	@uref{http://lists.nox.tf/lists.php}
 
 @node Bug Reports
 @section Bug Reports
@@ -315,7 +315,7 @@ the available mailing lists, see:
 
 If you think you have found a bug, please send a bug report to:
 
-@uref{http://bugzilla.quagga.net}
+@uref{http://github.com/freerangerouting/frr/issues}
 
 When you send a bug report, please be careful about the points below.
 
@@ -332,6 +332,6 @@ Please send your configuration file with the report.  If you specify
 arguments to the configure script please note that too.
 @end itemize
 
-  Bug reports are very important for us to improve the quality of Quagga.
-Quagga is still in the development stage, but please don't hesitate to
-send a bug report to @uref{http://bugzilla.quagga.net}.
+  Bug reports are very important for us to improve the quality of Frr.
+Frr is still in the development stage, but please don't hesitate to
+send a bug report to @uref{http://github.com/freerangerouting/frr/issues}.
diff --git a/doc/pimd.8 b/doc/pimd.8.in
index 0dd170a2c..60b844b1e 100644
--- a/doc/pimd.8
+++ b/doc/pimd.8.in
@@ -1,6 +1,6 @@
-.TH PIM 8 "10 December 2008" "Quagga PIM daemon" "Version 0.99.11"
+.TH PIM 8 "10 December 2008" "@PACKAGE_FULLNAME@ PIM daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-pimd \- a PIM routing for use with Quagga Routing Suite.
+pimd \- a PIM routing for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B pimd
 [
@@ -30,7 +30,7 @@ pimd \- a PIM routing for use with Quagga Routing Suite.
 .SH DESCRIPTION
 .B pimd
 is a protocol-independent multicast component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 Routing Suite.
 .SH OPTIONS
 Options available for the
@@ -42,10 +42,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/pimd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/pimd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -53,11 +53,11 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When pimd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart pimd.  The likely default is \fB\fI/var/run/pimd.pid\fR.
+restart pimd.  The default is \fB\fI@CFG_STATE@/pimd.pid\fR.
 .TP
 \fB\-z\fR, \fB\-\-socket \fR\fIpath\fR
 Specify the socket path for contacting the zebra daemon.
-The likely default is \fB\fI/var/run/zserv.api\fR.
+The default is \fB\fI@CFG_STATE@/zserv.api\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the pimd VTY will listen on. This defaults to
@@ -68,7 +68,7 @@ Specify the address that the pimd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-v\fR, \fB\-\-version\fR
 Print the version and exit.
@@ -77,22 +77,22 @@ Print the version and exit.
 Enable logging information for zclient debugging.
 .SH FILES
 .TP
-.BI /usr/local/sbin/pimd
+.BI @CFG_SBIN@/pimd
 The default location of the 
 .B pimd
 binary.
 .TP
-.BI /usr/local/etc/pimd.conf
+.BI @CFG_SYSCONF@/pimd.conf
 The default location of the 
 .B pimd
 config file.
 .TP
-.BI /var/run/pimd.pid
+.BI @CFG_STATE@/pimd.pid
 The default location of the 
 .B pimd
 pid file.
 .TP
-.BI /var/run/zserv.api
+.BI @CFG_STATE@/zserv.api
 The default location of the 
 .B zebra
 unix socket file.
diff --git a/doc/protocol.texi b/doc/protocol.texi
index 602768a78..7e8a96dc5 100644
--- a/doc/protocol.texi
+++ b/doc/protocol.texi
@@ -25,8 +25,11 @@ enough to allow for future extensions to done compatibly through
 seperate commands.
 
 Version 0 is used by all versions of GNU Zebra as of this writing, and
-versions of Quagga up to and including Quagga 0.98. Version 1 will be
-used as of Quagga 1.0.
+versions of Quagga up to and including Quagga 0.98. Version 2 was created
+for 0.99.21 of Quagga.  Version 3 designates VRF compatibility and was
+released in 1.0. Version 4 will be used as of Frr 2.0 to indicate that
+we are a different Routing Suite now and to hopefully prevent accidental
+Quagga <-> FRR issues.
 
 @appendixsection Zebra Protocol Definition
 @appendixsubsec Zebra Protocol Header (version 0)
diff --git a/doc/ripd.8 b/doc/ripd.8.in
index f042af228..6db5ac364 100644
--- a/doc/ripd.8
+++ b/doc/ripd.8.in
@@ -1,6 +1,6 @@
-.TH RIPD 8 "25 November 2004" "Quagga RIP daemon" "Version 0.97.3"
+.TH RIPD 8 "25 November 2004" "@PACKAGE_FULLNAME@ RIP daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-ripd \- a RIP routing engine for use with Quagga routing software.
+ripd \- a RIP routing engine for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B ripd
 [
@@ -27,7 +27,7 @@ ripd \- a RIP routing engine for use with Quagga routing software.
 .SH DESCRIPTION
 .B ripd
 is a routing component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -40,10 +40,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/ripd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/ripd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -51,7 +51,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When ripd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart ripd.  The likely default is \fB\fI/var/run/ripd.pid\fR.
+restart ripd.  The default is \fB\fI@CFG_STATE@/ripd.pid\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the ripd VTY will listen on. This defaults to
@@ -62,7 +62,7 @@ Specify the address that the ripd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-r\fR, \fB\-\-retain\fR 
 When the program terminates, retain routes added by \fBripd\fR.
@@ -71,12 +71,12 @@ When the program terminates, retain routes added by \fBripd\fR.
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/ripd
+.BI @CFG_SBIN@/ripd
 The default location of the 
 .B ripd
 binary.
 .TP
-.BI /etc/quagga/ripd.conf
+.BI @CFG_SYSCONF@/ripd.conf
 The default location of the 
 .B ripd
 config file.
@@ -88,7 +88,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBripd\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The ripd process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBripd\fR supports many
@@ -104,10 +104,10 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B ripd
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
diff --git a/doc/ripd.texi b/doc/ripd.texi
index 78d63eed4..da0f596af 100644
--- a/doc/ripd.texi
+++ b/doc/ripd.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
-@c This is part of the Quagga Manual.
+@c This is part of the Frr Manual.
 @c @value{COPYRIGHT_STR}
-@c See file quagga.texi for copying conditions.
+@c See file frr.texi for copying conditions.
 @node RIP
 @chapter RIP
 
@@ -97,7 +97,7 @@ to the packet on the basis of the interface that received the packet.
 Version 2 of RIP supports a variable length subnet mask (VLSM).  By
 extending the subnet mask, the mask can be divided and reused.  Each
 subnet can be used for different purposes such as large to middle size
-LANs and WAN links.  Quagga @command{ripd} does not support the non-sequential
+LANs and WAN links.  Frr @command{ripd} does not support the non-sequential
 netmasks that are included in RIP Version 2.
 
 In a case of similar information with the same prefix and metric, the
@@ -294,10 +294,10 @@ If you want to specify RIP only static routes:
 
 @deffn {RIP command} {route @var{a.b.c.d/m}} {}
 @deffnx {RIP command} {no route @var{a.b.c.d/m}} {}
-This command is specific to Quagga.  The @code{route} command makes a static
+This command is specific to Frr.  The @code{route} command makes a static
 route only inside RIP. This command should be used only by advanced
 users who are particularly knowledgeable about the RIP protocol.  In
-most cases, we recommend creating a static route in Quagga and
+most cases, we recommend creating a static route in Frr and
 redistributing it in RIP using @code{redistribute static}.
 @end deffn
 
@@ -399,7 +399,7 @@ redistribute connected [route-map MAP_NAME]
 @end example
 
 Cisco applies route-map _before_ routes will exported to rip route table. 
-In current Quagga's test implementation, @command{ripd} applies route-map
+In current Frr's test implementation, @command{ripd} applies route-map
 after routes are listed in the route table and before routes will be
 announced to an interface (something like output filter). I think it is not
 so clear, but it is draft and it may be changed at future.
diff --git a/doc/ripngd.8 b/doc/ripngd.8.in
index e4504fde4..4c5f2bb11 100644
--- a/doc/ripngd.8
+++ b/doc/ripngd.8.in
@@ -1,6 +1,6 @@
-.TH RIPNGD 8 "25 November 2004" "Quagga RIPNG daemon" "Version 0.97.3"
+.TH RIPNGD 8 "25 November 2004" "@PACKAGE_FULLNAME@ RIPNG daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-ripngd \- a RIPNG routing engine for use with Quagga routing software.
+ripngd \- a RIPNG routing engine for use with @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B ripngd
 [
@@ -27,7 +27,7 @@ ripngd \- a RIPNG routing engine for use with Quagga routing software.
 .SH DESCRIPTION
 .B ripngd
 is a routing component that works with the
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -40,10 +40,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR 
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/ripngd.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/ripngd.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -51,7 +51,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When ripngd starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart ripngd.  The likely default is \fB\fI/var/run/ripngd.pid\fR.
+restart ripngd.  The default is \fB\fI@CFG_STATE@/ripngd.pid\fR.
 .TP
 \fB\-P\fR, \fB\-\-vty_port \fR\fIport-number\fR 
 Specify the port that the ripngd VTY will listen on. This defaults to
@@ -62,7 +62,7 @@ Specify the address that the ripngd VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-r\fR, \fB\-\-retain\fR 
 When the program terminates, retain routes added by \fBripd\fR.
@@ -71,12 +71,12 @@ When the program terminates, retain routes added by \fBripd\fR.
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/ripngd
+.BI @CFG_SBIN@/ripngd
 The default location of the 
 .B ripngd
 binary.
 .TP
-.BI /etc/quagga/ripngd.conf
+.BI @CFG_SYSCONF@/ripngd.conf
 The default location of the 
 .B ripngd
 config file.
@@ -88,7 +88,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBripngd\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The ripngd process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBripngd\fR supports many
@@ -104,11 +104,11 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B ripngd
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/ripngd.texi b/doc/ripngd.texi
index 0e58de6da..1adda6943 100644
--- a/doc/ripngd.texi
+++ b/doc/ripngd.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
-@c This is part of the Quagga Manual.
+@c This is part of the Frr Manual.
 @c @value{COPYRIGHT_STR}
-@c See file quagga.texi for copying conditions.
+@c See file frr.texi for copying conditions.
 @node RIPng
 @chapter RIPng
 
diff --git a/doc/routeserver.texi b/doc/routeserver.texi
index f4a454621..b25800107 100644
--- a/doc/routeserver.texi
+++ b/doc/routeserver.texi
@@ -1,12 +1,12 @@
 @c -*-texinfo-*-
 @c @value{COPYRIGHT_STR}
-@c See file quagga.texi for copying conditions.
+@c See file frr.texi for copying conditions.
 @c
 @c This file is a modified version of Jose Luis Rubio's TeX sources 
 @c of his RS-Manual document
 
-@node Configuring Quagga as a Route Server
-@chapter Configuring Quagga as a Route Server
+@node Configuring Frr as a Route Server
+@chapter Configuring Frr as a Route Server
 
 The purpose of a Route Server is to centralize the peerings between BGP
 speakers. For example if we have an exchange point scenario with four BGP
@@ -15,9 +15,9 @@ speakers, each of which maintaining a BGP peering with the other three
 each of the four establishes a single BGP peering against the Route Server
 (@pxref{fig:route-server}).
 
-We will first describe briefly the Route Server model implemented by Quagga.
+We will first describe briefly the Route Server model implemented by Frr.
 We will explain the commands that have been added for configuring that
-model. And finally we will show a full example of Quagga configured as Route
+model. And finally we will show a full example of Frr configured as Route
 Server.
 
 @menu
@@ -148,7 +148,7 @@ It is also common to demand from a route server that it does not
 modify some BGP attributes (next-hop, as-path and MED) that are usually
 modified by standard BGP speakers before announcing a route.
 
-The announcement processing model implemented by Quagga is shown in
+The announcement processing model implemented by Frr is shown in
 @ref{fig:rs-processing}. The figure shows a mixture of RS-clients (B, C and D)
 with normal BGP peers (A). There are some details that worth additional
 comments:
@@ -180,7 +180,7 @@ they do not hurt anybody (they can always be left empty).
 @node Commands for configuring a Route Server
 @section Commands for configuring a Route Server
 
-Now we will describe the commands that have been added to quagga
+Now we will describe the commands that have been added to frr
 in order to support the route server features.
 
 @deffn {Route-Server} {neighbor @var{peer-group} route-server-client} {}
@@ -189,7 +189,7 @@ in order to support the route server features.
 This command configures the peer given by @var{peer}, @var{A.B.C.D} or
 @var{X:X::X:X} as an RS-client.
 
-Actually this command is not new, it already existed in standard Quagga. It
+Actually this command is not new, it already existed in standard Frr. It
 enables the transparent mode for the specified peer. This means that some
 BGP attributes (as-path, next-hop and MED) of the routes announced to that
 peer are not modified.
@@ -235,7 +235,7 @@ any normal (in or out) route-map.
 @node Example of Route Server Configuration
 @section Example of Route Server Configuration
 
-Finally we are going to show how to configure a Quagga daemon to act as a
+Finally we are going to show how to configure a Frr daemon to act as a
 Route Server. For this purpose we are going to present a scenario without
 route server, and then we will show how to use the configurations of the BGP
 routers to generate the configuration of the route server.
diff --git a/doc/snmp.texi b/doc/snmp.texi
index 0918a462f..c2c889de7 100644
--- a/doc/snmp.texi
+++ b/doc/snmp.texi
@@ -3,7 +3,7 @@
 
 @acronym{SNMP,Simple Network Managing Protocol} is a widely implemented
 feature for collecting network information from router and/or host.
-Quagga itself does not support SNMP agent (server daemon) functionality
+Frr itself does not support SNMP agent (server daemon) functionality
 but is able to connect to a SNMP agent using the SMUX protocol
 (@cite{RFC1227}) or the AgentX protocol (@cite{RFC2741}) and make the
 routing protocol MIBs available through it.
@@ -24,7 +24,7 @@ version of @code{net-snmp} which was formerly known as @code{ucd-snmp}.
 It is free and open software and available at @uref{http://www.net-snmp.org/}
 and as binary package for most Linux distributions.
 @code{net-snmp} has to be compiled with @code{--with-mib-modules=agentx} to
-be able to accept connections from Quagga using AgentX protocol or with
+be able to accept connections from Frr using AgentX protocol or with
 @code{--with-mib-modules=smux} to use SMUX protocol.
 
 Nowadays, SMUX is a legacy protocol. The AgentX protocol should be
@@ -33,11 +33,11 @@ preferred for any new deployment. Both protocols have the same coverage.
 @node AgentX configuration
 @section AgentX configuration
 
-To enable AgentX protocol support, Quagga must have been build with the
+To enable AgentX protocol support, Frr must have been build with the
 @code{--enable-snmp} or @code{--enable-snmp=agentx} option. Both the
-master SNMP agent (snmpd) and each of the Quagga daemons must be
+master SNMP agent (snmpd) and each of the Frr daemons must be
 configured. In @code{/etc/snmp/snmpd.conf}, @code{master agentx}
-directive should be added. In each of the Quagga daemons, @code{agentx}
+directive should be added. In each of the Frr daemons, @code{agentx}
 command will enable AgentX support.
 
 @example
@@ -54,7 +54,7 @@ command will enable AgentX support.
 	#
 	master agentx
 
-/etc/quagga/ospfd.conf:
+/etc/frr/ospfd.conf:
 	! ... the rest of ospfd.conf has been omitted for clarity ...
 	!
 	agentx
@@ -62,7 +62,7 @@ command will enable AgentX support.
 @end example
 
 Upon successful connection, you should get something like this in the
-log of each Quagga daemons:
+log of each Frr daemons:
 
 @example
 2012/05/25 11:39:08 ZEBRA: snmp[info]: NET-SNMP version 5.4.3 AgentX subagent connected
@@ -78,11 +78,11 @@ OSPF-MIB::ospfRouterId.0 = IpAddress: 192.168.42.109
 
 The AgentX protocol can be transported over a Unix socket or using TCP
 or UDP. It usually defaults to a Unix socket and depends on how NetSNMP
-was built. If need to configure Quagga to use another transport, you can
-configure it through @code{/etc/snmp/quagga.conf}:
+was built. If need to configure Frr to use another transport, you can
+configure it through @code{/etc/snmp/frr.conf}:
 
 @example
-/etc/snmp/quagga.conf:
+/etc/snmp/frr.conf:
 	[snmpd]
 	# Use a remote master agent
 	agentXSocket tcp:192.168.15.12:705
@@ -91,17 +91,17 @@ configure it through @code{/etc/snmp/quagga.conf}:
 @node SMUX configuration
 @section SMUX configuration
 
-To enable SMUX protocol support, Quagga must have been build with the
+To enable SMUX protocol support, Frr must have been build with the
 @code{--enable-snmp=smux} option.
 
 A separate connection has then to be established between the
-SNMP agent (snmpd) and each of the Quagga daemons. This connections
+SNMP agent (snmpd) and each of the Frr daemons. This connections
 each use different OID numbers and passwords. Be aware that this OID
 number is not the one that is used in queries by clients, it is solely
 used for the intercommunication of the daemons.
 
 In the following example the ospfd daemon will be connected to the
-snmpd daemon using the password "quagga_ospfd". For testing it is
+snmpd daemon using the password "frr_ospfd". For testing it is
 recommending to take exactly the below snmpd.conf as wrong access
 restrictions can be hard to debug.
 
@@ -115,24 +115,24 @@ restrictions can be hard to debug.
 	view all included .1 80
 	access MyROGroup "" any noauth exact all none none
 	#
-	# the following line is relevant for Quagga
+	# the following line is relevant for Frr
 	#
-	smuxpeer .1.3.6.1.4.1.3317.1.2.5 quagga_ospfd
+	smuxpeer .1.3.6.1.4.1.3317.1.2.5 frr_ospfd
 
-/etc/quagga/ospf:
+/etc/frr/ospf:
 	! ... the rest of ospfd.conf has been omitted for clarity ...
 	!
-	smux peer .1.3.6.1.4.1.3317.1.2.5 quagga_ospfd
+	smux peer .1.3.6.1.4.1.3317.1.2.5 frr_ospfd
 	!
 @end example
 
-After restarting snmpd and quagga, a successful connection can be verified in
+After restarting snmpd and frr, a successful connection can be verified in
 the syslog and by querying the SNMP daemon:
 
 @example
 snmpd[12300]: [smux_accept] accepted fd 12 from 127.0.0.1:36255 
 snmpd[12300]: accepted smux peer: \
-	oid GNOME-PRODUCT-ZEBRA-MIB::ospfd, quagga-0.96.5
+	oid GNOME-PRODUCT-ZEBRA-MIB::ospfd, frr-0.96.5
 
 # snmpwalk -c public -v1 localhost .1.3.6.1.2.1.14.1.1
 OSPF-MIB::ospfRouterId.0 = IpAddress: 192.168.42.109
@@ -148,7 +148,7 @@ troublesome @code{snmp_log()} line in the function
 @section MIB and command reference
 
 The following OID numbers are used for the interprocess communication of snmpd and
-the Quagga daemons with SMUX only.
+the Frr daemons with SMUX only.
 @example
             (OIDs below .iso.org.dod.internet.private.enterprises)
 zebra	.1.3.6.1.4.1.3317.1.2.1 .gnome.gnomeProducts.zebra.zserv
@@ -168,7 +168,7 @@ ripd	.1.3.6.1.2.1.23	    .iso.org.dot.internet.mgmt.mib-2.rip2
 ospf6d	.1.3.6.1.3.102	    .iso.org.dod.internet.experimental.ospfv3
 @end example
 
-The following syntax is understood by the Quagga daemons for configuring SNMP using SMUX:
+The following syntax is understood by the Frr daemons for configuring SNMP using SMUX:
 @deffn {Command} {smux peer @var{oid}} {}
 @deffnx {Command} {no smux peer @var{oid}} {}
 @end deffn
diff --git a/doc/snmptrap.texi b/doc/snmptrap.texi
index 31145639c..0dd3a703a 100644
--- a/doc/snmptrap.texi
+++ b/doc/snmptrap.texi
@@ -1,11 +1,11 @@
-@c Documentation on configuring Quagga and snmpd for SNMP traps
+@c Documentation on configuring Frr and snmpd for SNMP traps
 @c contributed by Jeroen Simonetti, jsimonetti@denit.net
 
 @node Handling SNMP Traps
 @section Handling SNMP Traps
 
-To handle snmp traps make sure your snmp setup of quagga works
-correctly as described in the quagga documentation in @xref{SNMP Support}.
+To handle snmp traps make sure your snmp setup of frr works
+correctly as described in the frr documentation in @xref{SNMP Support}.
 
 The BGP4 mib will send traps on peer up/down events. These should be
 visible in your snmp logs with a message similar to:
diff --git a/doc/vnc.texi b/doc/vnc.texi
index 341cbfcce..f375d3a7d 100644
--- a/doc/vnc.texi
+++ b/doc/vnc.texi
@@ -1,7 +1,7 @@
 @c -*-texinfo-*-
-@c This is part of the Quagga Manual.
+@c This is part of the Frr Manual.
 @c @value{COPYRIGHT_STR}
-@c See file quagga.texi for copying conditions.
+@c See file frr.texi for copying conditions.
 
 @node VNC and VNC-GW
 @chapter VNC and VNC-GW
@@ -97,8 +97,8 @@ configured.  The default is @code{encap-attr}.
 The protocol that is used to communicate routing and Ethernet / L2
 forwarding information between NVAs and NVEs is referred to as the
 Remote Forwarder Protocol (RFP).  Currently, only a simple example RFP
-is included in Quagga.  Developers may use this example as a starting
-point to integrate Quagga with an RFP of their choosing, e.g.,
+is included in Frr.  Developers may use this example as a starting
+point to integrate Frr with an RFP of their choosing, e.g.,
 @code{OpenFlow}.  The example code includes the following sample
 configuration: 
 
@@ -726,7 +726,7 @@ provided to other protocols, either via zebra or directly to BGP.
 It is important to note that when exporting routes to other protocols,
 the downstream protocol must also be configured to import the routes.
 For example, when VNC routes are exported to unicast BGP, the BGP
-configuration must include a corresponding @code{redistribute vpn}
+configuration must include a corresponding @code{redistribute vnc-direct}
 statement.
 
 @deffn {VNC} {export bgp|zebra mode none|group-nve|registering-nve|ce}
@@ -966,7 +966,7 @@ Print the number of memory items allocated by the NVA.
 @menu
 * Mesh NVA Configuration::
 * Mesh NVA and VNC-GW Configuration::
-* VNC with Quagga Route Reflector Configuration::
+* VNC with Frr Route Reflector Configuration::
 * VNC with Commercial Route Reflector Configuration::
 * VNC with Redundant Route Reflectors Configuration::
 @c * Interfacing VNC to an IGP::
@@ -1090,10 +1090,10 @@ VNC-GWs, each supporting two CE routers physically attached to the four
 NVEs.  Note that this example is showing a more complex configuration
 where VNC-GW is separated from normal NVA functions; it is equally
 possible to simplify the configuration and combine NVA and VNC-GW
-functions in a single quagga instance.
+functions in a single frr instance.
 
 @float Figure,fig:fig-vnc-gw
-@center @image{fig-vnc-gw,400pt,,Quagga VNC Gateway}
+@center @image{fig-vnc-gw,400pt,,Frr VNC Gateway}
 @caption{Meshed NVEs and VNC-GWs}
 @end float
 
@@ -1115,7 +1115,7 @@ The configuration for @code{VNC-GW 1} is shown below.
 router bgp 64512
  bgp router-id 192.168.1.101
  bgp cluster-id 1.2.3.4
- redistribute vpn
+ redistribute vnc-direct
  neighbor 192.168.1.102 remote-as 64512
  no neighbor 192.168.1.102 activate
  neighbor 192.168.1.103 remote-as 64512
@@ -1177,7 +1177,7 @@ router bgp 64512
 @c TBD make this its own example:
 @c 
 @c @float Figure,fig:fig-vnc-gw-rr
-@c @center @image{fig-vnc-gw-rr,400pt,,Quagga VNC Gateway with RR}
+@c @center @image{fig-vnc-gw-rr,400pt,,Frr VNC Gateway with RR}
 @c @end float
 @c An NVA can also import unicast routes from BGP without advertising the
 @c imported routes as VPN routes.  Such imported routes, while not
@@ -1195,17 +1195,17 @@ router bgp 64512
 @c  vnc redistribute ipv4 bgp-direct-to-nve-groups
 @c @end verbatim
 
-@node VNC with Quagga Route Reflector Configuration
-@subsection VNC with Quagga Route Reflector Configuration
+@node VNC with Frr Route Reflector Configuration
+@subsection VNC with Frr Route Reflector Configuration
 A route reflector eliminates the need for a fully meshed NVA
 network by acting as the hub between NVAs.
-@ref{fig:fig-vnc-quagga-route-reflector} shows BGP route reflector
+@ref{fig:fig-vnc-frr-route-reflector} shows BGP route reflector
 @code{BGP Route Reflector 1} (192.168.1.100) as a route reflector for
 NVAs @code{NVA 2}(192.168.1.101) and @code{NVA 3}
 (192.168.1.102).
 
-@float Figure,fig:fig-vnc-quagga-route-reflector
-@center @image{fig-vnc-quagga-route-reflector,400pt,,Quagga Route Reflector}
+@float Figure,fig:fig-vnc-frr-route-reflector
+@center @image{fig-vnc-frr-route-reflector,400pt,,Frr Route Reflector}
 @caption{Two NVAs and a BGP Route Reflector} 
 @end float
 
@@ -1298,7 +1298,7 @@ While not shown, an NVA can also be configured as a route reflector.
 
 @node VNC with Commercial Route Reflector Configuration
 @subsection VNC with Commercial Route Reflector Configuration
-This example is identical to @ref{VNC with Quagga Route Reflector
+This example is identical to @ref{VNC with Frr Route Reflector
 Configuration} with the exception that the route reflector is a
 commercial router.  Only the
 VNC-relevant configuration is provided. 
@@ -1408,7 +1408,7 @@ exit
 
 @node VNC with Redundant Route Reflectors Configuration
 @subsection VNC with Redundant Route Reflectors Configuration
-This example combines the previous two (@ref{VNC with Quagga Route
+This example combines the previous two (@ref{VNC with Frr Route
 Reflector Configuration} and @ref{VNC with Commercial Route Reflector
 Configuration}) into a redundant route reflector configuration.  BGP
 route reflectors @code{BGP Route Reflector 1} and @code{Commercial Router}
@@ -1418,7 +1418,7 @@ route reflectors.
 
 @float Figure,fig:fig-vnc-redundant-route-reflectors
 @center @image{fig-vnc-redundant-route-reflectors,400pt,,Redundant Route Reflectors}
-@caption{Quagga-based NVA with redundant route reflectors}
+@caption{Frr-based NVA with redundant route reflectors}
 @end float
 
 @file{bgpd.conf} for @code{Bgpd Route Reflector 1} on 192.168.1.100:
diff --git a/doc/vtysh.1 b/doc/vtysh.1.in
index d144cb642..7b5d4f132 100644
--- a/doc/vtysh.1
+++ b/doc/vtysh.1.in
@@ -1,6 +1,6 @@
-.TH VTYSH 1 "27 July 2006" "Quagga VTY shell" "Version 0.96.5"
+.TH VTYSH 1 "27 July 2006" "@PACKAGE_FULLNAME@ VTY shell" "Version @PACKAGE_VERSION@"
 .SH NAME
-vtysh \- a integrated shell for Quagga routing software
+vtysh \- a integrated shell for @PACKAGE_FULLNAME@.
 .SH SYNOPSIS
 .B vtysh
 [
@@ -21,7 +21,7 @@ vtysh \- a integrated shell for Quagga routing software
 .SH DESCRIPTION
 .B vtysh
 is a integrated shell for
-.B Quagga
+.B @PACKAGE_FULLNAME@
 routing engine.
 .SH OPTIONS
 Options available for the
@@ -29,8 +29,8 @@ Options available for the
 command:
 .IP "\fB\-b, \-\-boot\fP"
 Execute boot startup configuration. It makes sense only if integrated config
-file is in use (not default in Quagga). See Info file \fBQuagga\fR for more
-info.
+file is in use (not default in @PACKAGE_FULLNAME@). See Info file
+\fB@PACKAGE_NAME@\fR for more info.
 .IP "\fB\-c, \-\-command \fIcommand\fP"
 Specify command to be executed under batch mode. It behaves like -c option in
 any other shell -
@@ -39,7 +39,7 @@ is executed and
 .B vtysh
 exits.
 
-It's useful for gathering info from Quagga routing software or reconfiguring
+It's useful for gathering info from @PACKAGE_FULLNAME@ daemons or reconfiguring
 daemons from inside shell scripts, etc.
 Note that multiple commands may be executed by using more than one
 -c option and/or embedding linefeed characters inside the
@@ -48,13 +48,13 @@ string.
 .IP "\fB\-d, \-\-daemon \fIdaemon_name\fP"
 Specify which daemon to connect to.  By default,
 .B vtysh
-attempts to connect to all Quagga daemons running on the system.  With this
+attempts to connect to all @PACKAGE_FULLNAME@ daemons running on the system.  With this
 flag, one can specify a single daemon to connect to instead.  For example,
 specifying '-d ospfd' will connect only to ospfd.  This can be particularly
 useful inside scripts with -c where the command is targeted for a single daemon.
 .IP "\fB\-e, \-\-execute \fIcommand\fP"
 Alias for -c. It's here only for compatibility with Zebra routing software and
-older Quagga versions. This will be removed in future.
+older Frr versions. This will be removed in future.
 .IP "\fB\-E, \-\-echo\fP"
 When the -c option is being used, this flag will cause the standard
 .B vtysh
@@ -68,20 +68,20 @@ Display a usage message on standard output and exit.
 This should be the name of the pager to use. Default is \fBmore\fR.
 .SH FILES
 .TP
-.BI /etc/quagga/vtysh.conf
+.BI @CFG_SYSCONF@/vtysh.conf
 The default location of the 
 .B vtysh
 config file.
 .TP
-.BI /etc/quagga/Quagga.conf
-The default location of the integrated Quagga routing engine config file
+.BI @CFG_SYSCONF@/Frr.conf
+The default location of the integrated @PACKAGE_FULLNAME@ routing engine config file
 if integrated config file is in use (not default).
 .TP
-.BI ${HOME}/.history_quagga
+.BI ${HOME}/.history_frr
 Location of history of commands entered via cli
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH "SEE ALSO"
 .BR bgpd (8),
 .BR ripd (8),
@@ -93,11 +93,11 @@ options. The definitive document is the Info file \fBQuagga\fR.
 .SH BUGS
 .B vtysh
 eats bugs for breakfast. If you have food for the maintainers try 
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/doc/vtysh.texi b/doc/vtysh.texi
index 69b7acd3b..f3ebc26a1 100644
--- a/doc/vtysh.texi
+++ b/doc/vtysh.texi
@@ -5,7 +5,7 @@
 * Integrated configuration mode::
 @end menu
 
-@command{vtysh} provides a combined frontend to all Quagga daemons in a
+@command{vtysh} provides a combined frontend to all Frr daemons in a
 single combined session.  It is enabled by default at build time, but can
 be disabled through the @option{--disable-vtysh} option to
 @command{./configure}.
@@ -30,7 +30,7 @@ that directory, plus membership in the @emph{@value{INSTALL_VTY_GROUP}}
 group (which is the group that the daemons will change ownership of their
 sockets to).
 
-To restrict access to Quagga configuration, make sure no unauthorized users
+To restrict access to Frr configuration, make sure no unauthorized users
 are members of the @emph{@value{INSTALL_VTY_GROUP}} group.
 
 @subsection PAM support (experimental)
@@ -61,13 +61,13 @@ at all.
 @section Integrated configuration mode
 
 Integrated configuration mode uses a single configuration file,
-@file{Quagga.conf}, for all daemons.  This replaces the individual files like
+@file{Frr.conf}, for all daemons.  This replaces the individual files like
 @file{zebra.conf} or @file{bgpd.conf}.
 
-@file{Quagga.conf} is located in @file{@value{INSTALL_PREFIX_ETC}}.  All
+@file{Frr.conf} is located in @file{@value{INSTALL_PREFIX_ETC}}.  All
 daemons check for the existence of this file at startup, and if it exists
 will not load their individual configuration files.  Instead,
-@command{vtysh -b} must be invoked to process @file{Quagga.conf} and apply
+@command{vtysh -b} must be invoked to process @file{Frr.conf} and apply
 its settings to the individual daemons.
 
 @quotation Warning
@@ -76,7 +76,7 @@ its settings to the individual daemons.
 
 @subsection Configuration saving, file ownership and permissions
 
-The @file{Quagga.conf} file is not written by any of the daemons; instead
+The @file{Frr.conf} file is not written by any of the daemons; instead
 @command{vtysh} contains the neccessary logic to collect configuration from
 all of the daemons, combine it and write it out.
 
@@ -87,22 +87,22 @@ lost after doing a configuration save.
 @end quotation
 
 Since the @command{vtysh} command may be running as ordinary user on the
-system, configuration writes will be tried through @command{watchquagga},
+system, configuration writes will be tried through @command{watchfrr},
 using the @command{write integrated} command internally.  Since
-@command{watchquagga} is running as superuser, @command{vtysh} is able to
-ensure correct ownership and permissions on @file{Quagga.conf}.
+@command{watchfrr} is running as superuser, @command{vtysh} is able to
+ensure correct ownership and permissions on @file{Frr.conf}.
 
-If @command{watchquagga} is not running or the configuration write fails,
+If @command{watchfrr} is not running or the configuration write fails,
 @command{vtysh} will attempt to directly write to the file.  This is likely
 to fail if running as unprivileged user;  alternatively it may leave the
 file with incorrect owner or permissions.
 
 Writing the configuration can be triggered directly by invoking
 @command{vtysh -w}.  This may be useful for scripting.  Note this command
-should be run as either the superuser or the Quagga user.
+should be run as either the superuser or the Frr user.
 
 We recommend you do not mix the use of the two types of files. Further, it
-is better not to use the integrated Quagga.conf file, as any syntax error in
+is better not to use the integrated Frr.conf file, as any syntax error in
 it can lead to /all/ of your daemons being unable to start up. Per daemon
 files are more robust as impact of errors in configuration are limited to
 the daemon in whose file the error is made.
@@ -110,11 +110,11 @@ the daemon in whose file the error is made.
 @deffn {Command} {service integrated-vtysh-config} {}
 @deffnx {Command} {no service integrated-vtysh-config} {}
 
-Control whether integrated @file{Quagga.conf} file is written when
+Control whether integrated @file{Frr.conf} file is written when
 'write file' is issued.
 
 These commands need to be placed in @file{vtysh.conf} to have any effect.
-Note that since @file{vtysh.conf} is not written by Quagga itself, they
+Note that since @file{vtysh.conf} is not written by Frr itself, they
 therefore need to be manually placed in that file.
 
 This command has 3 states:
@@ -122,18 +122,18 @@ This command has 3 states:
 @item
 @command{service integrated-vtysh-config}
 
-@command{vtysh} will always write @file{Quagga.conf}.
+@command{vtysh} will always write @file{Frr.conf}.
 
 @item
 @command{no service integrated-vtysh-config}
 
-@command{vtysh} will never write @file{Quagga.conf}; instead it will ask
+@command{vtysh} will never write @file{Frr.conf}; instead it will ask
 daemons to write their individual configuration files.
 
 @item
 Neither option present (default)
 
-@command{vtysh} will check whether @file{Quagga.conf} exists.  If it does,
+@command{vtysh} will check whether @file{Frr.conf} exists.  If it does,
 configuration writes will update that file.  Otherwise, writes are performed
 through the individual daemons.
 @end itemize
@@ -146,8 +146,8 @@ installations.
 @deffn {Command} {write integrated} {}
 
 Unconditionally (regardless of @command{service integrated-vtysh-config}
-setting) write out integrated @file{Quagga.conf} file through
-@command{watchquagga}.  If @command{watchquagga} is not running, this command
+setting) write out integrated @file{Frr.conf} file through
+@command{watchfrr}.  If @command{watchfrr} is not running, this command
 is unavailable.
 
 @end deffn
@@ -156,6 +156,6 @@ is unavailable.
 
 Configuration changes made while some daemon is not running will be invisible
 to that daemon.  The daemon will start up with its saved configuration
-(either in its individual configuration file, or in @file{Quagga.conf}).
+(either in its individual configuration file, or in @file{Frr.conf}).
 This is particularly troublesome for route-maps and prefix lists, which would
 otherwise be synchronized between daemons.
diff --git a/doc/watchquagga.8 b/doc/watchfrr.8.in
index ca9916461..813f87abd 100644
--- a/doc/watchquagga.8
+++ b/doc/watchfrr.8.in
@@ -1,37 +1,37 @@
 .\" This file was originally generated by help2man 1.36.
-.TH WATCHQUAGGA 8 "July 2010"
+.TH WATCHFRR 8 "July 2010"
 .SH NAME
-watchquagga \- a program to monitor the status of quagga daemons
+watchfrr \- a program to monitor the status of frr daemons
 .SH SYNOPSIS
-.B watchquagga
+.B watchfrr
 .RI [ option ...]
 .IR daemon ...
 .br
-.B watchquagga
+.B watchfrr
 .BR \-h " | " \-v
 .SH DESCRIPTION
-.B watchquagga
-is a watchdog program that monitors the status of supplied quagga
+.B watchfrr
+is a watchdog program that monitors the status of supplied frr
 .IR daemon s
 and tries to restart them in case they become unresponsive or shut down.
 .PP
 To determine whether a daemon is running, it tries to connect to the
 daemon's VTY UNIX stream socket, and send echo commands to ensure the
 daemon responds. When the daemon crashes, EOF is received from the socket,
-so that watchquagga can react immediately.
+so that watchfrr can react immediately.
 .PP
 This program can run in one of the following 5 modes:
 .TP
 .B Mode 0: monitor
 In this mode, the program serves as a monitor and reports status changes.
 .IP
-Example usage: watchquagga \-d zebra ospfd bgpd
+Example usage: watchfrr \-d zebra ospfd bgpd
 .TP
 .B Mode 1: global restart
 In this mode, whenever a daemon hangs or crashes, the given command is used
 to restart all watched daemons.
 .IP
-Example usage: watchquagga \-dz \e
+Example usage: watchfrr \-dz \e
 .br
 -R '/sbin/service zebra restart; /sbin/service ospfd restart' \e
 .br
@@ -41,7 +41,7 @@ zebra ospfd
 In this mode, whenever a single daemon hangs or crashes, the given command
 is used to restart this daemon only.
 .IP
-Example usage: watchquagga \-dz \-r '/sbin/service %s restart' \e
+Example usage: watchfrr \-dz \-r '/sbin/service %s restart' \e
 .br
 zebra ospfd bgpd
 .TP
@@ -52,7 +52,7 @@ daemon; in this case, the following steps are taken: (1) all other daemons
 are stopped, (2) zebra is restarted, and (3) other daemons are started
 again.
 .IP
-Example usage: watchquagga \-adz \-r '/sbin/service %s restart' \e
+Example usage: watchfrr \-adz \-r '/sbin/service %s restart' \e
 .br
 \-s '/sbin/service %s start' \e
 .br
@@ -63,7 +63,7 @@ In this mode, whenever a single daemon hangs or crashes, the following
 steps are taken: (1) all other daemons are stopped, (2) zebra is restarted,
 and (3) other daemons are started again.
 .IP
-Example usage: watchquagga \-Adz \-r '/sbin/service %s restart' \e
+Example usage: watchfrr \-Adz \-r '/sbin/service %s restart' \e
 .br
 \-s '/sbin/service %s start' \e
 .br
@@ -95,7 +95,7 @@ instead of standard output (stdout).
 .BI \-S " directory" "\fR, \fB\-\-statedir " directory
 Set the VTY socket
 .I directory
-(the default value is "/var/run/quagga").
+(the default value is "/var/run/frr").
 .TP
 .BR \-e ", " \-\-no\-echo
 Do not ping the daemons to test whether they respond. This option is
@@ -196,7 +196,7 @@ options to be specified.
 .BI \-p " filename" "\fR, \fB\-\-pid\-file " filename
 Set the process identifier
 .I filename
-(the default value is "/var/run/quagga/watchquagga.pid").
+(the default value is "/var/run/frr/watchfrr.pid").
 .TP
 .BI \-b " string" "\fR, \fB\-\-blank\-string " string
 When the supplied
@@ -226,6 +226,6 @@ Display the usage information and exit.
 .BR ripd (8),
 .BR ripngd (8)
 .PP
-See the project homepage at <http://www.quagga.net/>.
+See the project homepage at <@PACKAGE_URL@>.
 .SH AUTHORS
 Copyright 2004 Andrew J. Schorr
diff --git a/doc/zebra.8 b/doc/zebra.8.in
index cb431da0a..e7d00e10a 100644
--- a/doc/zebra.8
+++ b/doc/zebra.8.in
@@ -1,6 +1,6 @@
-.TH ZEBRA 8 "25 November 2004" "Zebra daemon" "Version 0.97.3"
+.TH ZEBRA 8 "25 November 2004" "Zebra daemon" "Version @PACKAGE_VERSION@"
 .SH NAME
-zebra \- a routing manager for use with associated Quagga components.
+zebra \- a routing manager for use with associated @PACKAGE_FULLNAME@ components.
 .SH SYNOPSIS
 .B zebra
 [
@@ -44,10 +44,10 @@ Runs in daemon mode, forking and exiting from tty.
 .TP
 \fB\-f\fR, \fB\-\-config-file \fR\fIconfig-file\fR
 Specifies the config file to use for startup. If not specified this
-option will likely default to \fB\fI/usr/local/etc/zebra.conf\fR.
+option will default to \fB\fI@CFG_SYSCONF@/zebra.conf\fR.
 .TP
 \fB\-g\fR, \fB\-\-group \fR\fIgroup\fR
-Specify the group to run as. Default is \fIquagga\fR.
+Specify the group to run as. Default is \fI@enable_group@\fR.
 .TP
 \fB\-h\fR, \fB\-\-help\fR
 A brief message.
@@ -55,7 +55,7 @@ A brief message.
 \fB\-i\fR, \fB\-\-pid_file \fR\fIpid-file\fR
 When zebra starts its process identifier is written to
 \fB\fIpid-file\fR.  The init system uses the recorded PID to stop or
-restart zebra.  The likely default is \fB\fI/var/run/zebra.pid\fR.
+restart zebra.  The default is \fB\fI@CFG_STATE@/zebra.pid\fR.
 .TP
 \fB\-k\fR, \fB\-\-keep_kernel\fR
 On startup, don't delete self inserted routes.
@@ -69,7 +69,7 @@ Specify the address that the zebra VTY will listen on. Default is all
 interfaces.
 .TP
 \fB\-u\fR, \fB\-\-user \fR\fIuser\fR
-Specify the user to run as. Default is \fIquagga\fR.
+Specify the user to run as. Default is \fI@enable_user@\fR.
 .TP
 \fB\-r\fR, \fB\-\-retain\fR 
 When the program terminates, retain routes added by \fBzebra\fR.
@@ -90,12 +90,12 @@ Note that this affects Linux only.
 Print the version and exit.
 .SH FILES
 .TP
-.BI /usr/lib/quagga/zebra
+.BI @CFG_SBIN@/zebra
 The default location of the 
 .B zebra
 binary.
 .TP
-.BI /etc/quagga/zebra.conf
+.BI @CFG_SYSCONF@/zebra.conf
 The default location of the 
 .B zebra
 config file.
@@ -107,7 +107,7 @@ process is config'd to output logs to a file, then you will find this
 file in the directory where you started \fBzebra\fR.
 .SH WARNING
 This man page is intended to be a quick reference for command line
-options. The definitive document is the Info file \fBQuagga\fR.
+options. The definitive document is the Info file \fB@PACKAGE_NAME@\fR.
 .SH DIAGNOSTICS
 The zebra process may log to standard output, to a VTY, to a log
 file, or through syslog to the system logs. \fBzebra\fR supports many
@@ -123,11 +123,11 @@ debugging options, see the Info file, or the source for details.
 .SH BUGS
 .B zebra
 eats bugs for breakfast. If you have food for the maintainers try
-.BI http://bugzilla.quagga.net
+.BI @PACKAGE_BUGREPORT@
 .SH AUTHORS
 See
 .BI http://www.zebra.org
 and
-.BI http://www.quagga.net
+.BI @PACKAGE_URL@
 or the Info file for an accurate list of authors.
 
diff --git a/isisd/isis_main.c b/isisd/isis_main.c
index 84ebf8cea..f34be99ec 100644
--- a/isisd/isis_main.c
+++ b/isisd/isis_main.c
@@ -66,11 +66,11 @@ zebra_capabilities_t _caps_p[] = {
 };
 
 struct zebra_privs_t isisd_privs = {
-#if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+#if defined(FRR_USER)
+  .user = FRR_USER,
 #endif
-#if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+#if defined FRR_GROUP
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -150,7 +150,7 @@ Daemon which manages IS-IS routing\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
 
   exit (status);
@@ -382,7 +382,7 @@ main (int argc, char **argv, char **envp)
   vty_serv_sock (vty_addr, vty_port, ISIS_VTYSH_PATH);
 
   /* Print banner. */
-  zlog_notice ("Quagga-ISISd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+  zlog_notice ("Quagga-ISISd %s starting: vty@%d", FRR_VERSION, vty_port);
 
   /* Start finite state machine. */
   while (thread_fetch (master, &thread))
diff --git a/isisd/isis_redist.c b/isisd/isis_redist.c
index 045c7daa3..78014ce1d 100644
--- a/isisd/isis_redist.c
+++ b/isisd/isis_redist.c
@@ -544,7 +544,7 @@ DEFUN (isis_redistribute,
        REDIST_STR
        "Redistribute IPv4 routes\n"
        "Redistribute IPv6 routes\n"
-       QUAGGA_REDIST_HELP_STR_ISISD
+       FRR_REDIST_HELP_STR_ISISD
        "Redistribute into level-1\n"
        "Redistribute into level-2\n"
        "Metric for redistributed routes\n"
@@ -615,7 +615,7 @@ DEFUN (no_isis_redistribute,
        REDIST_STR
        "Redistribute IPv4 routes\n"
        "Redistribute IPv6 routes\n"
-       QUAGGA_REDIST_HELP_STR_ISISD
+       FRR_REDIST_HELP_STR_ISISD
        "Redistribute into level-1\n"
        "Redistribute into level-2\n")
 {
diff --git a/isisd/isisd.c b/isisd/isisd.c
index f09afeb93..1d4dab4fd 100644
--- a/isisd/isisd.c
+++ b/isisd/isisd.c
@@ -1749,10 +1749,13 @@ isis_area_is_type_set(struct isis_area *area, int is_type)
 
   spftree_area_init (area);
 
-  if (is_type & IS_LEVEL_1)
-    lsp_generate (area, IS_LEVEL_1);
-  if (is_type & IS_LEVEL_2)
-    lsp_generate (area, IS_LEVEL_2);
+  if (listcount (area->area_addrs) > 0)
+    {
+      if (is_type & IS_LEVEL_1)
+        lsp_generate (area, IS_LEVEL_1);
+      if (is_type & IS_LEVEL_2)
+        lsp_generate (area, IS_LEVEL_2);
+    }
   lsp_regenerate_schedule (area, IS_LEVEL_1 | IS_LEVEL_2, 1);
 
   return;
diff --git a/ldpd/lde.c b/ldpd/lde.c
index 67ed982ec..c2a5cf088 100644
--- a/ldpd/lde.c
+++ b/ldpd/lde.c
@@ -69,9 +69,9 @@ static zebra_capabilities_t _caps_p [] =
 
 static struct zebra_privs_t lde_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-	.user = QUAGGA_USER,
-	.group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+	.user = FRR_USER,
+	.group = FRR_GROUP,
 #endif
 #if defined(VTY_GROUP)
 	.vty_group = VTY_GROUP,
diff --git a/ldpd/ldpd.c b/ldpd/ldpd.c
index aa1dc57a7..8a9847bdf 100644
--- a/ldpd/ldpd.c
+++ b/ldpd/ldpd.c
@@ -103,9 +103,9 @@ static zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ldpd_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-	.user = QUAGGA_USER,
-	.group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+	.user = FRR_USER,
+	.group = FRR_GROUP,
 #endif
 #if defined(VTY_GROUP)
 	.vty_group = VTY_GROUP,
@@ -154,7 +154,7 @@ Daemon which manages LDP.\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
 	}
 
 	exit(status);
@@ -413,7 +413,7 @@ main(int argc, char *argv[])
 	vty_serv_sock(vty_addr, vty_port, LDP_VTYSH_PATH);
 
 	/* Print banner. */
-	log_notice("LDPd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+	log_notice("LDPd %s starting: vty@%d", FRR_VERSION, vty_port);
 
 	/* Fetch next active thread. */
 	while (thread_fetch(master, &thread))
diff --git a/ldpd/ldpe.c b/ldpd/ldpe.c
index aef33c8e3..37a3d79a2 100644
--- a/ldpd/ldpe.c
+++ b/ldpd/ldpe.c
@@ -66,9 +66,9 @@ static zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ldpe_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-	.user = QUAGGA_USER,
-	.group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+	.user = FRR_USER,
+	.group = FRR_GROUP,
 #endif
 #if defined(VTY_GROUP)
 	.vty_group = VTY_GROUP,
diff --git a/lib/agentx.c b/lib/agentx.c
index 5996b34a0..4175e7ba9 100644
--- a/lib/agentx.c
+++ b/lib/agentx.c
@@ -31,6 +31,7 @@
 #include "smux.h"
 #include "memory.h"
 #include "linklist.h"
+#include "version.h"
 
 static int agentx_enabled = 0;
 
@@ -175,7 +176,7 @@ DEFUN (agentx_enable,
 {
   if (!agentx_enabled)
     {
-      init_snmp("quagga");
+      init_snmp(FRR_SMUX_NAME);
       events = list_new();
       agentx_events_update ();
       agentx_enabled = 1;
@@ -209,7 +210,7 @@ smux_init (struct thread_master *tm)
 			  SNMP_CALLBACK_LOGGING,
 			  agentx_log_callback,
 			  NULL);
-  init_agent ("quagga");
+  init_agent (FRR_SMUX_NAME);
 
   install_node (&agentx_node, config_write_agentx);
   install_element (CONFIG_NODE, &agentx_enable_cmd);
diff --git a/lib/command.c b/lib/command.c
index ca0d0c001..039722ae6 100644
--- a/lib/command.c
+++ b/lib/command.c
@@ -85,12 +85,7 @@ static struct cmd_node config_node =
 };
 
 /* Default motd string. */
-static const char *default_motd =
-"\r\n\
-Hello, this is " QUAGGA_PROGNAME " (version " QUAGGA_VERSION ").\r\n\
-" QUAGGA_COPYRIGHT "\r\n\
-" GIT_INFO "\r\n";
-
+static const char *default_motd = FRR_DEFAULT_MOTD;
 
 static const struct facility_map {
   int facility;
@@ -159,9 +154,9 @@ level_match(const char *s)
 void
 print_version (const char *progname)
 {
-  printf ("%s version %s\n", progname, QUAGGA_VERSION);
-  printf ("%s\n", QUAGGA_COPYRIGHT);
-  printf ("configured with:\n\t%s\n", QUAGGA_CONFIG_ARGS);
+  printf ("%s version %s\n", progname, FRR_VERSION);
+  printf ("%s\n", FRR_COPYRIGHT);
+  printf ("configured with:\n\t%s\n", FRR_CONFIG_ARGS);
 }
 
 
@@ -1213,11 +1208,12 @@ DEFUN (show_version,
        SHOW_STR
        "Displays zebra version\n")
 {
-  vty_out (vty, "Quagga %s (%s).%s", QUAGGA_VERSION, host.name?host.name:"",
-           VTY_NEWLINE);
-  vty_out (vty, "%s%s%s", QUAGGA_COPYRIGHT, GIT_INFO, VTY_NEWLINE);
+  vty_out (vty, "%s %s (%s).%s", FRR_FULL_NAME, FRR_VERSION,
+	   host.name ? host.name : "",
+	   VTY_NEWLINE);
+  vty_out (vty, "%s%s%s", FRR_COPYRIGHT, GIT_INFO, VTY_NEWLINE);
   vty_out (vty, "configured with:%s    %s%s", VTY_NEWLINE,
-           QUAGGA_CONFIG_ARGS, VTY_NEWLINE);
+           FRR_CONFIG_ARGS, VTY_NEWLINE);
 
   return CMD_SUCCESS;
 }
@@ -2300,7 +2296,7 @@ install_default (enum node_type node)
  *
  * terminal = 0 -- vtysh / no logging, no config control
  * terminal = 1 -- normal daemon
- * terminal = -1 -- watchquagga / no logging, but minimal config control */
+ * terminal = -1 -- watchfrr / no logging, but minimal config control */
 void
 cmd_init (int terminal)
 {
diff --git a/lib/log.c b/lib/log.c
index f9877300b..6a3ce0779 100644
--- a/lib/log.c
+++ b/lib/log.c
@@ -20,7 +20,7 @@
  * 02111-1307, USA.  
  */
 
-#define QUAGGA_DEFINE_DESC_TABLE
+#define FRR_DEFINE_DESC_TABLE
 
 #include <zebra.h>
 
@@ -59,7 +59,7 @@ const char *zlog_proto_names[] =
   "ISIS",
   "PIM",
   "RFP",
-  "WATCHQUAGGA",
+  "WATCHFRR",
   NULL,
 };
 
@@ -1077,10 +1077,10 @@ proto_redistnum(int afi, const char *s)
 	return ZEBRA_ROUTE_BGP;
       else if (strncmp (s, "ta", 2) == 0)
 	return ZEBRA_ROUTE_TABLE;
-      else if (strncmp (s, "v", 1) == 0)
-	return ZEBRA_ROUTE_VNC;
-      else if (strncmp (s, "vd", 1) == 0)
+      else if (strcmp (s, "vnc-direct") == 0)
 	return ZEBRA_ROUTE_VNC_DIRECT;
+      else if (strcmp (s, "vnc") == 0)
+	return ZEBRA_ROUTE_VNC;
     }
   if (afi == AFI_IP6)
     {
@@ -1100,10 +1100,10 @@ proto_redistnum(int afi, const char *s)
 	return ZEBRA_ROUTE_BGP;
       else if (strncmp (s, "ta", 2) == 0)
 	return ZEBRA_ROUTE_TABLE;
-      else if (strncmp (s, "v", 1) == 0)
-	return ZEBRA_ROUTE_VNC;
-      else if (strncmp (s, "vd", 1) == 0)
+      else if (strcmp (s, "vnc-direct") == 0)
 	return ZEBRA_ROUTE_VNC_DIRECT;
+      else if (strcmp (s, "vnc") == 0)
+	return ZEBRA_ROUTE_VNC;
     }
   return -1;
 }
diff --git a/lib/log.h b/lib/log.h
index b36e5fbc8..3413cae5a 100644
--- a/lib/log.h
+++ b/lib/log.h
@@ -59,7 +59,7 @@ typedef enum
   ZLOG_ISIS,
   ZLOG_PIM,
   ZLOG_RFP,
-  ZLOG_WATCHQUAGGA,
+  ZLOG_WATCHFRR,
 } zlog_proto_t;
 
 /* If maxlvl is set to ZLOG_DISABLED, then no messages will be sent
diff --git a/lib/prefix.c b/lib/prefix.c
index 112dae582..84a04c530 100644
--- a/lib/prefix.c
+++ b/lib/prefix.c
@@ -665,7 +665,7 @@ str2prefix_ipv6 (const char *str, struct prefix_ipv6 *p)
       strncpy (cp, str, pnt - str);
       *(cp + (pnt - str)) = '\0';
       ret = inet_pton (AF_INET6, cp, &p->prefix);
-      free (cp);
+      XFREE (MTYPE_TMP, cp);
       if (ret == 0)
 	return 0;
       plen = (u_char) atoi (++pnt);
@@ -893,29 +893,22 @@ const char *
 prefix2str (union prefix46constptr pu, char *str, int size)
 {
   const struct prefix *p = pu.p;
-  char buf[PREFIX2STR_BUFFER];
-
-  if (p->family == AF_ETHERNET) {
-    int		i;
-    char	*s = str;
-
-    assert(size > (3*ETHER_ADDR_LEN) + 1 /* slash */ + 3 /* plen */ );
-    for (i = 0; i < ETHER_ADDR_LEN; ++i) {
-	sprintf(s, "%02x", p->u.prefix_eth.octet[i]);
-	if (i < (ETHER_ADDR_LEN - 1)) {
-	    *(s+2) = ':';
-	    s += 3;
-	} else {
-	    s += 2;
-	}
+
+  if (p->family == AF_ETHERNET)
+    {
+      snprintf(str, size, "%02x:%02x:%02x:%02x:%02x:%02x/%d",
+               p->u.prefix_eth.octet[0], p->u.prefix_eth.octet[1],
+               p->u.prefix_eth.octet[2], p->u.prefix_eth.octet[3],
+               p->u.prefix_eth.octet[4], p->u.prefix_eth.octet[5],
+               p->prefixlen);
+    }
+  else
+    {
+      char buf[PREFIX2STR_BUFFER];
+      inet_ntop(p->family, &p->u.prefix, buf, sizeof(buf));
+      snprintf(str, size, "%s/%d", buf, p->prefixlen);
     }
-    sprintf(s, "/%d", p->prefixlen);
-    return 0;
-  }
 
-  snprintf (str, size, "%s/%d",
-	    inet_ntop (p->family, &p->u.prefix, buf, PREFIX2STR_BUFFER),
-		       p->prefixlen);
   return str;
 }
 
diff --git a/lib/route_types.pl b/lib/route_types.pl
index d44cb12b2..62c7417b8 100755
--- a/lib/route_types.pl
+++ b/lib/route_types.pl
@@ -56,7 +56,7 @@ while (<STDIN>) {
 
 	# else: 7-field line
 	my @f = split(/,/, $_);
-	unless (@f == 7) {
+	unless (@f == 7 || @f == 8) {
 		die "invalid input on route_types line $.\n";
 	}
 
@@ -73,6 +73,7 @@ while (<STDIN>) {
 		"ipv4" => int($f[4]),
 		"ipv6" => int($f[5]),
 		"shorthelp" => $f[6],
+		"restrict2" => $f[7],
 	};
 	push @protos, $proto;
 	$daemons{$f[2]} = {
@@ -86,8 +87,8 @@ printf <<EOF, $ARGV[0];
 /* Auto-generated from route_types.txt by %s. */
 /* Do not edit! */
 
-#ifndef _QUAGGA_ROUTE_TYPES_H
-#define _QUAGGA_ROUTE_TYPES_H
+#ifndef _FRR_ROUTE_TYPES_H
+#define _FRR_ROUTE_TYPES_H
 
 /* Zebra route's' types. */
 EOF
@@ -137,6 +138,8 @@ sub collect {
 	my (@names, @help) = ((), ());
 	for my $p (@protos) {
 		next if ($protodetail{$p}->{"daemon"} eq $daemon && $daemon ne "zebra");
+		next if ($protodetail{$p}->{"restrict2"} ne "" && 
+		         $protodetail{$p}->{"restrict2"} ne $daemon);
 		next unless (($ipv4 && $protodetail{$p}->{"ipv4"})
 				|| ($ipv6 && $protodetail{$p}->{"ipv6"}));
 		push @names, $protodetail{$p}->{"cname"};
@@ -154,38 +157,38 @@ for my $daemon (sort keys %daemons) {
 	printf "/* %s */\n", $daemon;
 	if ($daemons{$daemon}->{"ipv4"} && $daemons{$daemon}->{"ipv6"}) {
 		my ($names, $help) = collect($daemon, 1, 1, 0);
-		printf "#define QUAGGA_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
-		printf "#define QUAGGA_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+		printf "#define FRR_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
+		printf "#define FRR_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
 		($names, $help) = collect($daemon, 1, 0, 0);
-		printf "#define QUAGGA_IP_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
-		printf "#define QUAGGA_IP_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+		printf "#define FRR_IP_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
+		printf "#define FRR_IP_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
 		($names, $help) = collect($daemon, 0, 1, 0);
-		printf "#define QUAGGA_IP6_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
-		printf "#define QUAGGA_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+		printf "#define FRR_IP6_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
+		printf "#define FRR_IP6_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
 		if ($daemon eq "zebra") {
 			($names, $help) = collect($daemon, 1, 0, 1);
-			printf "#define QUAGGA_IP_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
-			printf "#define QUAGGA_IP_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+			printf "#define FRR_IP_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
+			printf "#define FRR_IP_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 
 			($names, $help) = collect($daemon, 0, 1, 1);
-			printf "#define QUAGGA_IP6_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
-			printf "#define QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+			printf "#define FRR_IP6_PROTOCOL_MAP_STR_%s \\\n  %s\n", uc $daemon, $names;
+			printf "#define FRR_IP6_PROTOCOL_MAP_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 		}
 	} else {
 		my ($names, $help) = collect($daemon,
 			$daemons{$daemon}->{"ipv4"}, $daemons{$daemon}->{"ipv6"}, 0);
-		printf "#define QUAGGA_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
-		printf "#define QUAGGA_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
+		printf "#define FRR_REDIST_STR_%s \\\n  %s\n", uc $daemon, $names;
+		printf "#define FRR_REDIST_HELP_STR_%s \\\n%s\n", uc $daemon, $help;
 	}
 	print "\n";
 }
 
 print <<EOF;
 
-#ifdef QUAGGA_DEFINE_DESC_TABLE
+#ifdef FRR_DEFINE_DESC_TABLE
 
 struct zebra_desc_table
 {
@@ -208,8 +211,8 @@ print <<EOF;
 };
 #undef DESC_ENTRY
 
-#endif /* QUAGGA_DEFINE_DESC_TABLE */
+#endif /* FRR_DEFINE_DESC_TABLE */
 
-#endif /* _QUAGGA_ROUTE_TYPES_H */
+#endif /* _FRR_ROUTE_TYPES_H */
 EOF
 
diff --git a/lib/route_types.txt b/lib/route_types.txt
index 56e8c1456..74d4f2a49 100644
--- a/lib/route_types.txt
+++ b/lib/route_types.txt
@@ -64,9 +64,9 @@ ZEBRA_ROUTE_LDP,        ldp,       ldpd,   'L', 0, 0, "LDP"
 #vnc when sent to zebra 
 ZEBRA_ROUTE_VNC,        vnc,       NULL,   'v', 1, 1, "VNC"
 # vnc when sent to bgp
-ZEBRA_ROUTE_VNC_DIRECT, vpn,       NULL,   'V', 1, 1, "VPN"
-# vnc when sent to bgp (remote next hop?)
-ZEBRA_ROUTE_VNC_DIRECT_RH, vpn-rh, NULL,   'V', 0, 0, "VPN"
+ZEBRA_ROUTE_VNC_DIRECT, vnc-direct,NULL,   'V', 1, 1, "VNC-Direct", bgpd
+# vnc when sent to bgp (resolve NVE mode)
+ZEBRA_ROUTE_VNC_DIRECT_RH, vnc-rn, NULL,   'V', 0, 0, "VNC-RN"
 #  bgp unicast -> vnc 
 ZEBRA_ROUTE_BGP_DIRECT, bgp-direct, NULL,  'b', 0, 0, "BGP-Direct"
 #  bgp unicast -> vnc 
@@ -90,4 +90,4 @@ ZEBRA_ROUTE_VNC,    "Virtual Network Control (VNC)"
 ZEBRA_ROUTE_OLSR,   "Optimised Link State Routing (OLSR)"
 ZEBRA_ROUTE_TABLE,  "Non-main Kernel Routing Table"
 ZEBRA_ROUTE_LDP,    "Label Distribution Protocol (LDP)"
-ZEBRA_ROUTE_VNC_DIRECT,    "VPN routes(VPN)"
+ZEBRA_ROUTE_VNC_DIRECT,    "VNC direct (not via zebra) routes"
diff --git a/lib/routemap.c b/lib/routemap.c
index 5f2b2c0df..487790bbf 100644
--- a/lib/routemap.c
+++ b/lib/routemap.c
@@ -2940,9 +2940,13 @@ route_map_finish (void)
     }
 
   for (i = 1; i < ROUTE_MAP_DEP_MAX; i++)
-    hash_free(route_map_dep_hash[i]);
+    {
+      hash_free(route_map_dep_hash[i]);
+      route_map_dep_hash[i] = NULL;
+    }
 
   hash_free (route_map_master_hash);
+  route_map_master_hash = NULL;
 }
 
 /* Initialization of route map vector. */
diff --git a/lib/smux.c b/lib/smux.c
index 82bf64f1c..bf3892637 100644
--- a/lib/smux.c
+++ b/lib/smux.c
@@ -922,7 +922,7 @@ smux_open (int sock)
   u_char *ptr;
   size_t len;
   long version;
-  const char progname[] = QUAGGA_PROGNAME "-" QUAGGA_VERSION;
+  const char progname[] = FRR_SMUX_NAME "-" FRR_VERSION;
 
   if (debug_smux)
     {
diff --git a/lib/version.h.in b/lib/version.h.in
index 1f95f0c5f..adc827818 100644
--- a/lib/version.h.in
+++ b/lib/version.h.in
@@ -35,17 +35,21 @@
 #define GIT_INFO ""
 #endif
 
-#define QUAGGA_PROGNAME   "@PACKAGE_NAME@"
-
-#define QUAGGA_VERSION     "@PACKAGE_VERSION@" GIT_SUFFIX
-
-#define ZEBRA_BUG_ADDRESS "@PACKAGE_BUGREPORT@"
-
-#define QUAGGA_URL "http://www.quagga.net"
-
-#define QUAGGA_COPYRIGHT "Copyright 1996-2005 Kunihiro Ishiguro, et al."
-
-#define QUAGGA_CONFIG_ARGS "@CONFIG_ARGS@"
+#define FRR_PAM_NAME    "@PACKAGE_NAME@"
+#define FRR_SMUX_NAME   "@PACKAGE_NAME@"
+#define FRR_PTM_NAME    "@PACKAGE_NAME@"
+
+#define FRR_FULL_NAME   "FreeRangeRouting"
+#define FRR_VERSION     "@PACKAGE_VERSION@" GIT_SUFFIX
+#define FRR_BUG_ADDRESS "@PACKAGE_BUGREPORT@"
+#define FRR_COPYRIGHT   "Copyright 1996-2005 Kunihiro Ishiguro, et al."
+#define FRR_CONFIG_ARGS "@CONFIG_ARGS@"
+
+#define FRR_DEFAULT_MOTD \
+	"\r\n" \
+	"Hello, this is " FRR_FULL_NAME " (version " FRR_VERSION ").\r\n" \
+	FRR_COPYRIGHT "\r\n" \
+	GIT_INFO "\r\n"
 
 pid_t pid_output (const char *);
 
diff --git a/lib/vty.c b/lib/vty.c
index d5ecb1db5..1fe2e5d29 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2246,7 +2246,7 @@ vtysh_read (struct thread *thread)
           if (ret == CMD_SUSPEND)
             break;
 
-          /* warning: watchquagga hardcodes this result write */
+          /* warning: watchfrr hardcodes this result write */
 	  header[3] = ret;
 	  buffer_put(vty->obuf, header, 4);
 
diff --git a/lib/zclient.h b/lib/zclient.h
index 7ea5bc963..4312cdc83 100644
--- a/lib/zclient.h
+++ b/lib/zclient.h
@@ -123,7 +123,7 @@ struct zserv_header
                          * always set to 255 in new zserv.
                          */
   uint8_t version;
-#define ZSERV_VERSION	3
+#define ZSERV_VERSION	4
   vrf_id_t vrf_id;
   uint16_t command;
 };
diff --git a/lib/zebra.h b/lib/zebra.h
index fd1aa3cf7..3a9ad15bf 100644
--- a/lib/zebra.h
+++ b/lib/zebra.h
@@ -411,7 +411,7 @@ typedef enum {
  * the command value in the old zserv header. To allow old and new
  * Zserv headers to be distinguished from each other.
  */
-#define ZEBRA_HEADER_MARKER              255
+#define ZEBRA_HEADER_MARKER              254
 
 /* Zebra route's types are defined in route_types.h */
 #include "route_types.h"
diff --git a/ospf6d/ospf6_asbr.c b/ospf6d/ospf6_asbr.c
index d31b4b95b..7d5aca119 100644
--- a/ospf6d/ospf6_asbr.c
+++ b/ospf6d/ospf6_asbr.c
@@ -688,7 +688,7 @@ DEFUN (ospf6_redistribute,
        ospf6_redistribute_cmd,
        "redistribute <kernel|connected|static|ripng|isis|bgp|table>",
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_OSPF6D)
+       FRR_REDIST_HELP_STR_OSPF6D)
 {
   int type;
 
@@ -705,7 +705,7 @@ DEFUN (ospf6_redistribute_routemap,
        ospf6_redistribute_routemap_cmd,
        "redistribute <kernel|connected|static|ripng|isis|bgp|table> route-map WORD",
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_OSPF6D
+       FRR_REDIST_HELP_STR_OSPF6D
        "Route map reference\n"
        "Route map name\n")
 {
@@ -728,7 +728,7 @@ DEFUN (no_ospf6_redistribute,
        "no redistribute <kernel|connected|static|ripng|isis|bgp|table> [route-map WORD]",
        NO_STR
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_OSPF6D
+       FRR_REDIST_HELP_STR_OSPF6D
        "Route map reference\n"
        "Route map name\n")
 {
@@ -744,7 +744,6 @@ DEFUN (no_ospf6_redistribute,
   return CMD_SUCCESS;
 }
 
-
 int
 ospf6_redistribute_config_write (struct vty *vty)
 {
diff --git a/ospf6d/ospf6_main.c b/ospf6d/ospf6_main.c
index 11a77059b..bd3a2faa5 100644
--- a/ospf6d/ospf6_main.c
+++ b/ospf6d/ospf6_main.c
@@ -63,11 +63,11 @@ zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ospf6d_privs =
 {
-#if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+#if defined(FRR_USER)
+  .user = FRR_USER,
 #endif
-#if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+#if defined FRR_GROUP
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -131,7 +131,7 @@ Daemon which manages OSPF version 3.\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
 
   exit (status);
@@ -361,7 +361,7 @@ main (int argc, char *argv[], char *envp[])
 
   /* Print start message */
   zlog_notice ("OSPF6d (Quagga-%s ospf6d-%s) starts: vty@%d",
-               QUAGGA_VERSION, OSPF6_DAEMON_VERSION,vty_port);
+               FRR_VERSION, OSPF6_DAEMON_VERSION,vty_port);
 
   /* Start finite state machine, here we go! */
   while (thread_fetch (master, &thread))
diff --git a/ospfd/ospf_main.c b/ospfd/ospf_main.c
index 43aa683fa..e0719b397 100644
--- a/ospfd/ospf_main.c
+++ b/ospfd/ospf_main.c
@@ -63,9 +63,9 @@ zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ospfd_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #if defined(VTY_GROUP)
   .vty_group = VTY_GROUP,
@@ -133,7 +133,7 @@ Daemon which manages OSPF.\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
   exit (status);
 }
@@ -360,8 +360,8 @@ main (int argc, char **argv)
   /* Create VTY socket */
   if (instance)
     {
-      sprintf(pid_file, "/var/run/quagga/ospfd-%d.pid", instance);
-      sprintf(vty_path, "/var/run/quagga/ospfd-%d.vty", instance);
+      sprintf(pid_file, "%s/ospfd-%d.pid", DAEMON_VTY_DIR, instance);
+      sprintf(vty_path, "%s/ospfd-%d.vty", DAEMON_VTY_DIR, instance);
     }
   else
     {
@@ -373,7 +373,7 @@ main (int argc, char **argv)
   vty_serv_sock (vty_addr, vty_port, vty_path);
 
   /* Print banner. */
-  zlog_notice ("OSPFd %s starting: vty@%d, %s", QUAGGA_VERSION, vty_port, vty_path);
+  zlog_notice ("OSPFd %s starting: vty@%d, %s", FRR_VERSION, vty_port, vty_path);
 
   /* Fetch next active thread. */
   while (thread_fetch (master, &thread))
diff --git a/ospfd/ospf_vty.c b/ospfd/ospf_vty.c
index c2999ca02..c5137c085 100644
--- a/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@ -7097,7 +7097,7 @@ DEFUN (ospf_redistribute_source,
        ospf_redistribute_source_cmd,
        "redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]",
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_OSPFD
+       FRR_REDIST_HELP_STR_OSPFD
        "Metric for redistributed routes\n"
        "OSPF default metric\n"
        "OSPF exterior metric type for redistributed routes\n"
@@ -7153,7 +7153,7 @@ DEFUN (no_ospf_redistribute_source,
        "no redistribute <kernel|connected|static|rip|isis|bgp|pim|table> [<metric (0-16777214)|metric-type (1-2)|route-map WORD>]",
        NO_STR
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_OSPFD
+       FRR_REDIST_HELP_STR_OSPFD
        "Metric for redistributed routes\n"
        "OSPF default metric\n"
        "OSPF exterior metric type for redistributed routes\n"
@@ -7309,7 +7309,7 @@ DEFUN (ospf_distribute_list_out,
        "Filter networks in routing updates\n"
        "Access-list name\n"
        OUT_STR
-       QUAGGA_REDIST_HELP_STR_OSPFD)
+       FRR_REDIST_HELP_STR_OSPFD)
 {
   VTY_DECLVAR_CONTEXT(ospf, ospf);
   int idx_word = 1;
@@ -7330,7 +7330,7 @@ DEFUN (no_ospf_distribute_list_out,
        "Filter networks in routing updates\n"
        "Access-list name\n"
        OUT_STR
-       QUAGGA_REDIST_HELP_STR_OSPFD)
+       FRR_REDIST_HELP_STR_OSPFD)
 {
   VTY_DECLVAR_CONTEXT(ospf, ospf);
   int idx_word = 2;
diff --git a/pimd/AUTHORS b/pimd/AUTHORS
index f6135a410..08869ff6f 100644
--- a/pimd/AUTHORS
+++ b/pimd/AUTHORS
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 # Everton da Silva Marques <everton.marques@gmail.com>
 $ more ~/.gitconfig
 [user]
diff --git a/pimd/CAVEATS b/pimd/CAVEATS
index 9f07bda66..43dd823ae 100644
--- a/pimd/CAVEATS
+++ b/pimd/CAVEATS
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 C1 IGMPv3 backward compatibility with IGMPv1 and IGMPv2 is not
    implemented. See RFC 3376, 7.3. Multicast Router Behavior. That's
    because only Source-Specific Multicast is currently targeted.
diff --git a/pimd/COMMANDS b/pimd/COMMANDS
index 425ac8229..c545eca56 100644
--- a/pimd/COMMANDS
+++ b/pimd/COMMANDS
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 global configuration commands:
        pimd:
        ip multicast-routing	Enable IP multicast forwarding
diff --git a/pimd/DEBUG b/pimd/DEBUG
index 72fb8264b..a6ad260e8 100644
--- a/pimd/DEBUG
+++ b/pimd/DEBUG
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 DEBUG HINTS
 
   - Check the source is issuing multicast packets with TTL high enough
diff --git a/pimd/LINUX_KERNEL_MROUTE_MFC b/pimd/LINUX_KERNEL_MROUTE_MFC
index e87e567f9..3e482465f 100644
--- a/pimd/LINUX_KERNEL_MROUTE_MFC
+++ b/pimd/LINUX_KERNEL_MROUTE_MFC
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 #
 # The Linux Kernel MFC (Multicast Forwarding Cache)
 #
diff --git a/pimd/Makefile.am b/pimd/Makefile.am
index eba05076d..bc28aa1e9 100644
--- a/pimd/Makefile.am
+++ b/pimd/Makefile.am
@@ -1,5 +1,4 @@
 ## Process this file with automake to produce Makefile.in.
-## $QuaggaId: $Format:%an, %ai, %h$ $
 
 # qpimd - pimd for quagga
 # Copyright (C) 2008 Everton da Silva Marques
diff --git a/pimd/README b/pimd/README
index 1e3f72c83..c8997808b 100644
--- a/pimd/README
+++ b/pimd/README
@@ -1,7 +1,3 @@
-#
-# $QuaggaId: $Format:%an, %ai, %h$ $
-#
-
 INTRODUCTION
 
         qpimd aims to implement a PIM (Protocol Independent Multicast)
diff --git a/pimd/TODO b/pimd/TODO
index 2308573b8..4c0f18310 100644
--- a/pimd/TODO
+++ b/pimd/TODO
@@ -1,5 +1,3 @@
-# $QuaggaId: $Format:%an, %ai, %h$ $
-
 T1 DONE Implement debug command
    test pim receive join
 
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index d3df6a110..f09540ea0 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_assert.h b/pimd/pim_assert.h
index bd3fb3e25..ec18cab85 100644
--- a/pimd/pim_assert.h
+++ b/pimd/pim_assert.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_ASSERT_H
diff --git a/pimd/pim_cmd.c b/pimd/pim_cmd.c
index e50837ebe..088713012 100644
--- a/pimd/pim_cmd.c
+++ b/pimd/pim_cmd.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_cmd.h b/pimd/pim_cmd.h
index 53df562ab..34f350e36 100644
--- a/pimd/pim_cmd.h
+++ b/pimd/pim_cmd.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_CMD_H
diff --git a/pimd/pim_hello.c b/pimd/pim_hello.c
index 21d0e5b85..1cd44f253 100644
--- a/pimd/pim_hello.c
+++ b/pimd/pim_hello.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_hello.h b/pimd/pim_hello.h
index b5e272d5d..3a6d3361b 100644
--- a/pimd/pim_hello.h
+++ b/pimd/pim_hello.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_HELLO_H
diff --git a/pimd/pim_iface.c b/pimd/pim_iface.c
index a8a1d0880..bac9692ca 100644
--- a/pimd/pim_iface.c
+++ b/pimd/pim_iface.c
@@ -15,8 +15,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_iface.h b/pimd/pim_iface.h
index 790afabea..e56559ca4 100644
--- a/pimd/pim_iface.h
+++ b/pimd/pim_iface.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IFACE_H
diff --git a/pimd/pim_ifchannel.c b/pimd/pim_ifchannel.c
index abfa5cc2b..7afb7a5bd 100644
--- a/pimd/pim_ifchannel.c
+++ b/pimd/pim_ifchannel.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h
index e6f1c2947..ce753222e 100644
--- a/pimd/pim_ifchannel.h
+++ b/pimd/pim_ifchannel.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IFCHANNEL_H
diff --git a/pimd/pim_igmp.c b/pimd/pim_igmp.c
index 3b63b10e0..ef1b3cbac 100644
--- a/pimd/pim_igmp.c
+++ b/pimd/pim_igmp.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmp.h b/pimd/pim_igmp.h
index c6685c283..eb0377ce8 100644
--- a/pimd/pim_igmp.h
+++ b/pimd/pim_igmp.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IGMP_H
diff --git a/pimd/pim_igmp_join.h b/pimd/pim_igmp_join.h
index 1700276de..ba80db069 100644
--- a/pimd/pim_igmp_join.h
+++ b/pimd/pim_igmp_join.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IGMP_JOIN_H
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c
index 7300e6c6b..bdaf2bb27 100644
--- a/pimd/pim_igmpv3.c
+++ b/pimd/pim_igmpv3.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_igmpv3.h b/pimd/pim_igmpv3.h
index bb7e92672..db7895f9b 100644
--- a/pimd/pim_igmpv3.h
+++ b/pimd/pim_igmpv3.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_IGMPV3_H
diff --git a/pimd/pim_int.c b/pimd/pim_int.c
index 208075190..44b8386a3 100644
--- a/pimd/pim_int.c
+++ b/pimd/pim_int.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_int.h b/pimd/pim_int.h
index d64b10327..a6349b5b3 100644
--- a/pimd/pim_int.h
+++ b/pimd/pim_int.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_INT_H
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 3852b423f..6a5fb851d 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_join.h b/pimd/pim_join.h
index 37ec0f452..dcdca0035 100644
--- a/pimd/pim_join.h
+++ b/pimd/pim_join.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_JOIN_H
diff --git a/pimd/pim_macro.c b/pimd/pim_macro.c
index 39098df52..622bef443 100644
--- a/pimd/pim_macro.c
+++ b/pimd/pim_macro.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_macro.h b/pimd/pim_macro.h
index 472fa9b4e..3079ca80c 100644
--- a/pimd/pim_macro.h
+++ b/pimd/pim_macro.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_MACRO_H
diff --git a/pimd/pim_main.c b/pimd/pim_main.c
index aa3db3d5b..29432ea23 100644
--- a/pimd/pim_main.c
+++ b/pimd/pim_main.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
@@ -77,9 +75,9 @@ zebra_capabilities_t _caps_p [] =
 /* pimd privileges to run with */
 struct zebra_privs_t pimd_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -176,7 +174,7 @@ int main(int argc, char** argv, char** envp) {
       break;
     case 'v':
       printf(PIMD_PROGNAME " version %s\n", PIMD_VERSION);
-      print_version(QUAGGA_PROGNAME);
+      print_version(progname);
       exit (0);
       break;
 #ifdef PIM_ZCLIENT_DEBUG
@@ -196,7 +194,7 @@ int main(int argc, char** argv, char** envp) {
   master = thread_master_create();
 
   zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting",
-	      QUAGGA_VERSION, PIMD_VERSION);
+	      FRR_VERSION, PIMD_VERSION);
 
   /* 
    * Initializations
@@ -243,7 +241,7 @@ int main(int argc, char** argv, char** envp) {
   vty_serv_sock(vty_addr, vty_port, PIM_VTYSH_PATH);
 
   zlog_notice("Quagga %s " PIMD_PROGNAME " %s starting, VTY interface at port TCP %d",
-	      QUAGGA_VERSION, PIMD_VERSION, vty_port);
+	      FRR_VERSION, PIMD_VERSION, vty_port);
 
 #ifdef PIM_DEBUG_BYDEFAULT
   zlog_notice("PIM_DEBUG_BYDEFAULT: Enabling all debug commands");
diff --git a/pimd/pim_mroute.c b/pimd/pim_mroute.c
index 56f49d62f..3fbed8880 100644
--- a/pimd/pim_mroute.c
+++ b/pimd/pim_mroute.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_mroute.h b/pimd/pim_mroute.h
index 176fb81cb..f385ce09f 100644
--- a/pimd/pim_mroute.h
+++ b/pimd/pim_mroute.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_MROUTE_H
diff --git a/pimd/pim_msg.c b/pimd/pim_msg.c
index aa0433a2e..9d0fc0ad8 100644
--- a/pimd/pim_msg.c
+++ b/pimd/pim_msg.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_msg.h b/pimd/pim_msg.h
index a884fc84d..96a89659e 100644
--- a/pimd/pim_msg.h
+++ b/pimd/pim_msg.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_MSG_H
diff --git a/pimd/pim_neighbor.c b/pimd/pim_neighbor.c
index 7e7cbc0d1..04792eb35 100644
--- a/pimd/pim_neighbor.c
+++ b/pimd/pim_neighbor.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_neighbor.h b/pimd/pim_neighbor.h
index 5b2172dfc..e023a7f1e 100644
--- a/pimd/pim_neighbor.h
+++ b/pimd/pim_neighbor.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_NEIGHBOR_H
diff --git a/pimd/pim_oil.c b/pimd/pim_oil.c
index 96f9ef2b6..ebbc6e19f 100644
--- a/pimd/pim_oil.c
+++ b/pimd/pim_oil.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_oil.h b/pimd/pim_oil.h
index c63c026c0..540acce3a 100644
--- a/pimd/pim_oil.h
+++ b/pimd/pim_oil.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_OIL_H
diff --git a/pimd/pim_pim.c b/pimd/pim_pim.c
index 0dfd39cd1..0f41a4331 100644
--- a/pimd/pim_pim.c
+++ b/pimd/pim_pim.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_pim.h b/pimd/pim_pim.h
index 4b378fb2c..5692a3793 100644
--- a/pimd/pim_pim.h
+++ b/pimd/pim_pim.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_PIM_H
diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index 11d846448..8d6e7b70c 100644
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_rpf.h b/pimd/pim_rpf.h
index 72cc7ba21..4d55bd688 100644
--- a/pimd/pim_rpf.h
+++ b/pimd/pim_rpf.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_RPF_H
diff --git a/pimd/pim_signals.c b/pimd/pim_signals.c
index 0344aa81d..bd4d9e485 100644
--- a/pimd/pim_signals.c
+++ b/pimd/pim_signals.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_signals.h b/pimd/pim_signals.h
index 62523c038..7b25608c1 100644
--- a/pimd/pim_signals.h
+++ b/pimd/pim_signals.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_SIGNALS_H
diff --git a/pimd/pim_sock.c b/pimd/pim_sock.c
index 231efd0f2..54816d126 100644
--- a/pimd/pim_sock.c
+++ b/pimd/pim_sock.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_sock.h b/pimd/pim_sock.h
index cd29543fa..f905c661d 100644
--- a/pimd/pim_sock.h
+++ b/pimd/pim_sock.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_SOCK_H
diff --git a/pimd/pim_ssmpingd.c b/pimd/pim_ssmpingd.c
index fba563a6f..ece644a86 100644
--- a/pimd/pim_ssmpingd.c
+++ b/pimd/pim_ssmpingd.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_ssmpingd.h b/pimd/pim_ssmpingd.h
index 4bef20b20..54f787e2a 100644
--- a/pimd/pim_ssmpingd.h
+++ b/pimd/pim_ssmpingd.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_SSMPINGD_H
diff --git a/pimd/pim_static.c b/pimd/pim_static.c
index 5882142b3..565d6fe72 100644
--- a/pimd/pim_static.c
+++ b/pimd/pim_static.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_static.h b/pimd/pim_static.h
index 07d31d59b..c288aa7ff 100644
--- a/pimd/pim_static.h
+++ b/pimd/pim_static.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_STATIC_H_
diff --git a/pimd/pim_str.c b/pimd/pim_str.c
index 3a8353cd8..c81704569 100644
--- a/pimd/pim_str.c
+++ b/pimd/pim_str.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_str.h b/pimd/pim_str.h
index 925f17f73..d2af0110a 100644
--- a/pimd/pim_str.h
+++ b/pimd/pim_str.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_STR_H
diff --git a/pimd/pim_time.c b/pimd/pim_time.c
index 4e5832cc6..75f767fef 100644
--- a/pimd/pim_time.c
+++ b/pimd/pim_time.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_time.h b/pimd/pim_time.h
index 2984d9a8d..8ccc6a920 100644
--- a/pimd/pim_time.h
+++ b/pimd/pim_time.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_TIME_H
diff --git a/pimd/pim_tlv.c b/pimd/pim_tlv.c
index 38f6de9fe..546ceb86e 100644
--- a/pimd/pim_tlv.c
+++ b/pimd/pim_tlv.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_tlv.h b/pimd/pim_tlv.h
index 8556e931a..16c5aa4b9 100644
--- a/pimd/pim_tlv.h
+++ b/pimd/pim_tlv.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_TLV_H
diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 826788575..059de3b62 100644
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h
index ea44707c5..f10c8feb3 100644
--- a/pimd/pim_upstream.h
+++ b/pimd/pim_upstream.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_UPSTREAM_H
diff --git a/pimd/pim_util.c b/pimd/pim_util.c
index 57a8488ec..f5b6a8210 100644
--- a/pimd/pim_util.c
+++ b/pimd/pim_util.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_util.h b/pimd/pim_util.h
index a8613e2b9..d780bfbc2 100644
--- a/pimd/pim_util.h
+++ b/pimd/pim_util.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_UTIL_H
diff --git a/pimd/pim_version.c b/pimd/pim_version.c
index f3a5ee335..a43c27d5b 100644
--- a/pimd/pim_version.c
+++ b/pimd/pim_version.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_version.h b/pimd/pim_version.h
index ef9f370c7..64e07862d 100644
--- a/pimd/pim_version.h
+++ b/pimd/pim_version.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_VERSION_H
diff --git a/pimd/pim_vty.c b/pimd/pim_vty.c
index 95792d5aa..f9bc2319e 100644
--- a/pimd/pim_vty.c
+++ b/pimd/pim_vty.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_vty.h b/pimd/pim_vty.h
index 904ee5530..18a632e01 100644
--- a/pimd/pim_vty.h
+++ b/pimd/pim_vty.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_VTY_H
diff --git a/pimd/pim_zebra.c b/pimd/pim_zebra.c
index 1822de229..f2195960c 100644
--- a/pimd/pim_zebra.c
+++ b/pimd/pim_zebra.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_zebra.h b/pimd/pim_zebra.h
index 8e8f09551..257c9b896 100644
--- a/pimd/pim_zebra.h
+++ b/pimd/pim_zebra.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_ZEBRA_H
diff --git a/pimd/pim_zlookup.c b/pimd/pim_zlookup.c
index 86d7edbd0..af561a0b6 100644
--- a/pimd/pim_zlookup.c
+++ b/pimd/pim_zlookup.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pim_zlookup.h b/pimd/pim_zlookup.h
index f2be6d4fa..dbce92647 100644
--- a/pimd/pim_zlookup.h
+++ b/pimd/pim_zlookup.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIM_ZLOOKUP_H
diff --git a/pimd/pimd.c b/pimd/pimd.c
index 91d8d56af..15e52afc1 100644
--- a/pimd/pimd.c
+++ b/pimd/pimd.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/pimd/pimd.conf.sample b/pimd/pimd.conf.sample
index 67530856b..de1da6b83 100644
--- a/pimd/pimd.conf.sample
+++ b/pimd/pimd.conf.sample
@@ -1,6 +1,5 @@
 !
 ! pimd sample configuration file
-! $QuaggaId: $Format:%an, %ai, %h$ $
 !
 hostname quagga-pimd-router
 password zebra
diff --git a/pimd/pimd.h b/pimd/pimd.h
index 8855a2ab3..2230a6ce9 100644
--- a/pimd/pimd.h
+++ b/pimd/pimd.h
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #ifndef PIMD_H
diff --git a/pimd/test_igmpv3_join.c b/pimd/test_igmpv3_join.c
index 5c4574024..29143f362 100644
--- a/pimd/test_igmpv3_join.c
+++ b/pimd/test_igmpv3_join.c
@@ -16,8 +16,6 @@
   along with this program; see the file COPYING; if not, write to the
   Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
   MA 02110-1301 USA
-  
-  $QuaggaId: $Format:%an, %ai, %h$ $
 */
 
 #include <zebra.h>
diff --git a/redhat/Makefile.am b/redhat/Makefile.am
index 96870689d..c70e71fef 100644
--- a/redhat/Makefile.am
+++ b/redhat/Makefile.am
@@ -3,6 +3,6 @@ EXTRA_DIST = bgpd.init isisd.init \
 	ospf6d.init ospfd.init ldpd.init \
 	quagga.logrotate quagga.pam quagga.spec \
 	quagga.sysconfig ripd.init ripngd.init  \
-	watchquagga.init pimd.init  zebra.init  \
+	watchfrr.init pimd.init  zebra.init  \
 	README.rpm_build.md
 
diff --git a/redhat/README.rpm_build.md b/redhat/README.rpm_build.md
index 05a0bdc59..c164d740b 100644
--- a/redhat/README.rpm_build.md
+++ b/redhat/README.rpm_build.md
@@ -59,7 +59,7 @@ Building your own Quagga RPM
 		%{!?quagga_user:       %global  quagga_user     quagga }
 		%{!?vty_group:         %global  vty_group       quaggavt }
 		%{!?with_fpm:          %global  with_fpm        0 }
-		%{!?with_watchquagga:  %global  with_watchquagga 1 }
+		%{!?with_watchfrr:  %global  with_watchfrr 1 }
 
 6. Build the RPM
 
@@ -84,11 +84,11 @@ Enabling daemons after installation of the package:
 		chkconfig bgpd on
 		... etc
 
-2. If you want to run `watchquagga`, then configure `/etc/sysconfig/quagga` 
-   and uncomment the line with the daemons for `watchquagga` to monitor,
-   then enable watchquagga
+2. If you want to run `watchfrr`, then configure `/etc/sysconfig/quagga` 
+   and uncomment the line with the daemons for `watchfrr` to monitor,
+   then enable watchfrr
 
-		chkconfig watchquagga on
+		chkconfig watchfrr on
 
 3. Check your firewall / IPtables to make sure the routing protocols are
 allowed.
@@ -113,7 +113,7 @@ Configuration is stored in `/etc/quagga/*.conf` files.
 		systemctl enable bgpd
 		... etc
 
-	Note: There is no watchquagga on systemd based systems. Systemd contains
+	Note: There is no watchfrr on systemd based systems. Systemd contains
 	the functionality of monitoring and restarting daemons.
 
 2. Check your firewall / IPtables to make sure the routing protocols are
diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index 207889d92..5a5d4c4c7 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -23,7 +23,7 @@
 %{!?quagga_user:		%global	quagga_user		quagga }
 %{!?vty_group:			%global	vty_group		quaggavty }
 %{!?with_fpm:			%global	with_fpm 		0 }
-%{!?with_watchquagga:		%global	with_watchquagga 	1 }
+%{!?with_watchfrr:		%global	with_watchfrr 	1 }
 %{!?with_bgp_vnc:		%global	with_bgp_vnc 		0 }
 
 # path defines
@@ -52,13 +52,13 @@
 # Check for init.d (upstart) as used in CentOS 6 or systemd (ie CentOS 7)
 %{expand: %%global initsystem %(if [[ `/sbin/init --version 2> /dev/null` =~ upstart ]]; then echo upstart; elif [[ `systemctl` =~ -\.mount ]]; then echo systemd; fi)}
 #
-# If init system is systemd, then always disable watchquagga
+# If init system is systemd, then always disable watchfrr
 #
 %if "%{initsystem}" == "systemd"
-	# Note: For systems with systemd, watchquagga will NOT be built. Systemd
+	# Note: For systems with systemd, watchfrr will NOT be built. Systemd
 	# takes over the role of restarting crashed processes. Value will
 	# be overwritten with 0 below for systemd independent on the setting here
-	%global	with_watchquagga 1
+	%global	with_watchfrr 1
 %endif
 
 # if FPM is enabled, then enable tcp_zebra as well
@@ -80,13 +80,13 @@
 %define		daemon_ldpd	""
 %endif
 
-%if %{with_watchquagga}
-%define         daemon_watchquagga	watchquagga
+%if %{with_watchfrr}
+%define         daemon_watchfrr	watchfrr
 %else
-%define		daemon_watchquagga	""
+%define		daemon_watchfrr	""
 %endif
 
-%define		all_daemons	%{daemon_list} %{daemon_ldpd} %{daemon_watchquagga}
+%define		all_daemons	%{daemon_list} %{daemon_ldpd} %{daemon_watchfrr}
 
 # allow build dir to be kept
 %{!?keep_build:		%global		keep_build	0 }
@@ -232,10 +232,10 @@ developing OSPF-API and quagga applications.
 %else
 	--disable-fpm \
 %endif
-%if %{with_watchquagga}
-	--enable-watchquagga \
+%if %{with_watchfrr}
+	--enable-watchfrr \
 %else
-	--disable-watchquagga \
+	--disable-watchfrr \
 %endif
 %if %{with_bgp_vnc}
 	--enable-bgp-vnc \
@@ -269,8 +269,8 @@ rm -rf %{buildroot}/usr/share/info/dir
 # install /etc sources
 %if "%{initsystem}" == "systemd"
 mkdir -p %{buildroot}%{_unitdir}
-install %{quagga_tools}/quagga.service \
-	%{buildroot}%{_unitdir}/quagga.service
+install %{quagga_tools}/frr.service \
+	%{buildroot}%{_unitdir}/frr.service
 %else
 mkdir -p %{buildroot}/etc/rc.d/init.d
 for daemon in %{all_daemons} ; do
@@ -345,7 +345,7 @@ zebra_spec_add_service ldpd     2612/tcp "LDPd vty"
 
 %if "%{initsystem}" == "systemd"
 for daemon in %all_daemons ; do
-	%systemd_post quagga.service
+	%systemd_post frr.service
 done
 %else
 for daemon in %all_daemons ; do
@@ -371,9 +371,9 @@ for daemon in %{all_daemons} ; do
 		%endif
 	fi
 done
-%if %{with_watchquagga}
-	# No config for watchquagga - this is part of /etc/sysconfig/quagga
-	rm -f %{_sysconfdir}/watchquagga.*
+%if %{with_watchfrr}
+	# No config for watchfrr - this is part of /etc/sysconfig/quagga
+	rm -f %{_sysconfdir}/watchfrr.*
 %endif
 
 if [ ! -e %{_sysconfdir}/vtysh.conf ]; then
@@ -397,16 +397,16 @@ if [ "$1" -ge 1 ]; then
 	# Rename restart flags for daemons handled specially.
 	running_zebra="$restart_zebra"
 	restart_zebra=no
-	%if %{with_watchquagga}
-		running_watchquagga="$restart_watchquagga"
-		restart_watchquagga=no
+	%if %{with_watchfrr}
+		running_watchfrr="$restart_watchfrr"
+		restart_watchfrr=no
 	%endif
 	
 	%if "%{initsystem}" == "systemd"
 		##
 		## Systemd Version
 		##
-		# No watchquagga for systemd version
+		# No watchfrr for systemd version
 		#
 		# Stop all daemons other than zebra.
 		for daemon in %all_daemons ; do
@@ -427,12 +427,12 @@ if [ "$1" -ge 1 ]; then
 		##
 		## init.d Version
 		##
-		%if %{with_watchquagga}
-			# Stop watchquagga first.
-			[ "$running_watchquagga" = yes ] && \
-				/etc/rc.d/init.d/watchquagga stop >/dev/null 2>&1
+		%if %{with_watchfrr}
+			# Stop watchfrr first.
+			[ "$running_watchfrr" = yes ] && \
+				/etc/rc.d/init.d/watchfrr stop >/dev/null 2>&1
 		%endif
-		# Stop all daemons other than zebra and watchquagga.
+		# Stop all daemons other than zebra and watchfrr.
 		for daemon in %all_daemons ; do
 			eval restart=\$restart_${daemon}
 			[ "$restart" = yes ] && \
@@ -441,18 +441,18 @@ if [ "$1" -ge 1 ]; then
 		# Restart zebra.
 		[ "$running_zebra" = yes ] && \
 			/etc/rc.d/init.d/zebra restart >/dev/null 2>&1
-		# Start all daemons other than zebra and watchquagga.
+		# Start all daemons other than zebra and watchfrr.
 		for daemon in %all_daemons ; do
 			eval restart=\$restart_${daemon}
 			[ "$restart" = yes ] && \
 				/etc/rc.d/init.d/${daemon} start >/dev/null 2>&1
 		done
-		%if %{with_watchquagga}
-			# Start watchquagga last.
-			# Avoid postun scriptlet error if watchquagga is not running. 
-			[ "$running_watchquagga" = yes ] && \
-				/etc/rc.d/init.d/watchquagga start >/dev/null 2>&1 || :
-		%endif	
+		%if %{with_watchfrr}
+			# Start watchfrr last.
+			# Avoid postun scriptlet error if watchfrr is not running.
+			[ "$running_watchfrr" = yes ] && \
+				/etc/rc.d/init.d/watchfrr start >/dev/null 2>&1 || :
+		%endif
 	%endif
 fi
 
@@ -510,11 +510,11 @@ rm -rf %{buildroot}
 %{_sbindir}/bgpd
 %{_sbindir}/ssd
 %{_sbindir}/quagga
-%{_sbindir}/quagga-reload.py
-%{_sbindir}/quagga-reload.pyc
-%{_sbindir}/quagga-reload.pyo
-%if %{with_watchquagga}
-	%{_sbindir}/watchquagga
+%{_sbindir}/frr-reload.py
+%{_sbindir}/frr-reload.pyc
+%{_sbindir}/frr-reload.pyo
+%if %{with_watchfrr}
+	%{_sbindir}/watchfrr
 %endif
 %{_sbindir}/ripngd
 %{_sbindir}/ospf6d
@@ -530,11 +530,11 @@ rm -rf %{buildroot}
 %{_bindir}/*
 %config /etc/quagga/[!v]*
 %if "%{initsystem}" == "systemd"
-	%config %{_unitdir}/quagga.service
+	%config %{_unitdir}/frr.service
 %else
 	%config /etc/rc.d/init.d/zebra
-	%if %{with_watchquagga}
-		%config /etc/rc.d/init.d/watchquagga
+	%if %{with_watchfrr}
+		%config /etc/rc.d/init.d/watchfrr
 	%endif
 	%config /etc/rc.d/init.d/ripd
 	%config /etc/rc.d/init.d/ospfd
@@ -586,7 +586,7 @@ rm -rf %{buildroot}
 - Add conditional logic to only build tex footnotes with supported texi2html 
 - Added pimd to files section and fix double listing of /var/lib*/quagga
 - Numerous fixes to unify upstart/systemd startup into same spec file
-- Only allow use of watchquagga for non-systemd systems. no need with systemd
+- Only allow use of watchfrr for non-systemd systems. no need with systemd
 
 * Fri Sep  4 2015 Paul Jakma <paul@jakma.org>
 - buildreq updates
@@ -607,7 +607,7 @@ rm -rf %{buildroot}
 - daemonv6_list should contain only IPv6 daemons
 
 * Wed Dec 22 2004 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
-- watchquagga added
+- watchfrr added
 - on upgrade, all daemons should be condrestart'ed
 - on removal, all daemons should be stopped
 
diff --git a/redhat/quagga.sysconfig b/redhat/quagga.sysconfig
index 0cc6acfba..97c28c807 100644
--- a/redhat/quagga.sysconfig
+++ b/redhat/quagga.sysconfig
@@ -11,7 +11,7 @@ ZEBRA_OPTS="-A 127.0.0.1"
 PIMD_OPTS="-A 127.0.0.1"
 LDPD_OPTS="-A 127.0.0.1"
 
-# Watchquagga configuration for LSB initscripts
+# Watchfrr configuration for LSB initscripts
 #
 # (Not needed with systemd: the service files are configured to automatically
 # restart any daemon on failure. If zebra fails, all running daemons will be
diff --git a/redhat/watchquagga.init b/redhat/watchquagga.init
index dda350662..51259edc0 100644
--- a/redhat/watchquagga.init
+++ b/redhat/watchquagga.init
@@ -2,9 +2,9 @@
 # chkconfig: 2345 17 83
 
 ### BEGIN INIT INFO
-# Provides: watchquagga
-# Short-Description: Quagga watchdog
-# Description: Quagga watchdog for use with Zebra
+# Provides: watchfrr
+# Short-Description: Frr watchdog
+# Description: Frr watchdog for use with Zebra
 ### END INIT INFO
 
 # source function library
@@ -13,13 +13,13 @@
 # Get network config
 . /etc/sysconfig/network
 
-# quagga command line options
+# frr command line options
 . /etc/sysconfig/quagga
 
 RETVAL=0
-PROG="watchquagga"
-cmd=watchquagga
-LOCK_FILE=/var/lock/subsys/watchquagga
+PROG="watchfrr"
+cmd=watchfrr
+LOCK_FILE=/var/lock/subsys/watchfrr
 
 case "$1" in
   start)
diff --git a/ripd/rip_main.c b/ripd/rip_main.c
index 796647c3e..cfcb60168 100644
--- a/ripd/rip_main.c
+++ b/ripd/rip_main.c
@@ -65,11 +65,11 @@ zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ripd_privs =
 {
-#if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+#if defined(FRR_USER)
+  .user = FRR_USER,
 #endif
-#if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+#if defined FRR_GROUP
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -123,7 +123,7 @@ Daemon which manages RIP version 1 and 2.\n\n\
 -v, --version      Print program version\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
 
   exit (status);
@@ -314,7 +314,7 @@ main (int argc, char **argv)
   vty_serv_sock (vty_addr, vty_port, RIP_VTYSH_PATH);
 
   /* Print banner. */
-  zlog_notice ("RIPd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+  zlog_notice ("RIPd %s starting: vty@%d", FRR_VERSION, vty_port);
 
   /* Execute each thread. */
   while (thread_fetch (master, &thread))
diff --git a/ripd/rip_zebra.c b/ripd/rip_zebra.c
index 5aea4f522..dfebebb5b 100644
--- a/ripd/rip_zebra.c
+++ b/ripd/rip_zebra.c
@@ -333,7 +333,7 @@ DEFUN (rip_redistribute_type,
        rip_redistribute_type_cmd,
        "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>",
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD)
+       FRR_REDIST_HELP_STR_RIPD)
 {
   int i;
 
@@ -359,7 +359,7 @@ DEFUN (no_rip_redistribute_type,
        "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table>",
        NO_STR
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD)
+       FRR_REDIST_HELP_STR_RIPD)
 {
   int i;
 
@@ -385,7 +385,7 @@ DEFUN (rip_redistribute_type_routemap,
        rip_redistribute_type_routemap_cmd,
        "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD",
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD
+       FRR_REDIST_HELP_STR_RIPD
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
@@ -415,7 +415,7 @@ DEFUN (no_rip_redistribute_type_routemap,
        "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> route-map WORD",
        NO_STR
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD
+       FRR_REDIST_HELP_STR_RIPD
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
@@ -445,7 +445,7 @@ DEFUN (rip_redistribute_type_metric,
        rip_redistribute_type_metric_cmd,
        "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)",
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD
+       FRR_REDIST_HELP_STR_RIPD
        "Metric\n"
        "Metric value\n")
 {
@@ -478,7 +478,7 @@ DEFUN (no_rip_redistribute_type_metric,
        "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16)",
        NO_STR
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD
+       FRR_REDIST_HELP_STR_RIPD
        "Metric\n"
        "Metric value\n")
 {
@@ -508,7 +508,7 @@ DEFUN (rip_redistribute_type_metric_routemap,
        rip_redistribute_type_metric_routemap_cmd,
        "redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD",
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD
+       FRR_REDIST_HELP_STR_RIPD
        "Metric\n"
        "Metric value\n"
        "Route map reference\n"
@@ -546,7 +546,7 @@ DEFUN (no_rip_redistribute_type_metric_routemap,
        "no redistribute <kernel|connected|static|ospf|isis|bgp|pim|table> metric (0-16) route-map WORD",
        NO_STR
        REDIST_STR
-       QUAGGA_REDIST_HELP_STR_RIPD
+       FRR_REDIST_HELP_STR_RIPD
        "Metric\n"
        "Metric value\n"
        "Route map reference\n"
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index e7ecbf969..14711a1a6 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -70,11 +70,11 @@ zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t ripngd_privs =
 {
-#if defined(QUAGGA_USER)
-  .user = QUAGGA_USER,
+#if defined(FRR_USER)
+  .user = FRR_USER,
 #endif
-#if defined QUAGGA_GROUP
-  .group = QUAGGA_GROUP,
+#if defined FRR_GROUP
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -125,7 +125,7 @@ Daemon which manages RIPng.\n\n\
 -C, --dryrun       Check configuration for validity and exit\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
   exit (status);
 }
@@ -309,7 +309,7 @@ main (int argc, char **argv)
   pid_output (pid_file);
 
   /* Print banner. */
-  zlog_notice ("RIPNGd %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+  zlog_notice ("RIPNGd %s starting: vty@%d", FRR_VERSION, vty_port);
 
   /* Fetch next active thread. */
   while (thread_fetch (master, &thread))
diff --git a/ripngd/ripng_zebra.c b/ripngd/ripng_zebra.c
index 09472683d..c5096305e 100644
--- a/ripngd/ripng_zebra.c
+++ b/ripngd/ripng_zebra.c
@@ -317,7 +317,7 @@ DEFUN (ripng_redistribute_type,
        ripng_redistribute_type_cmd,
        "redistribute <kernel|connected|static|ospf6|isis|bgp|table>",
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD)
+       FRR_REDIST_HELP_STR_RIPNGD)
 {
   int type;
 
@@ -338,7 +338,7 @@ DEFUN (no_ripng_redistribute_type,
        "no redistribute <kernel|connected|static|ospf6|isis|bgp|table> [metric (0-16)] [route-map WORD]",
        NO_STR
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
+       FRR_REDIST_HELP_STR_RIPNGD
        "Metric\n"
        "Metric value\n"
        "Route map reference\n"
@@ -363,7 +363,7 @@ DEFUN (ripng_redistribute_type_metric,
        ripng_redistribute_type_metric_cmd,
        "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16)",
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
+       FRR_REDIST_HELP_STR_RIPNGD
        "Metric\n"
        "Metric value\n")
 {
@@ -387,12 +387,11 @@ DEFUN (ripng_redistribute_type_metric,
   return CMD_SUCCESS;
 }
 
-
 DEFUN (ripng_redistribute_type_routemap,
        ripng_redistribute_type_routemap_cmd,
        "redistribute <kernel|connected|static|ospf6|isis|bgp|table> route-map WORD",
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
+       FRR_REDIST_HELP_STR_RIPNGD
        "Route map reference\n"
        "Pointer to route-map entries\n")
 {
@@ -414,12 +413,11 @@ DEFUN (ripng_redistribute_type_routemap,
  return CMD_SUCCESS;
 }
 
-
 DEFUN (ripng_redistribute_type_metric_routemap,
        ripng_redistribute_type_metric_routemap_cmd,
        "redistribute <kernel|connected|static|ospf6|isis|bgp|table> metric (0-16) route-map WORD",
        "Redistribute\n"
-       QUAGGA_REDIST_HELP_STR_RIPNGD
+       FRR_REDIST_HELP_STR_RIPNGD
        "Metric\n"
        "Metric value\n"
        "Route map reference\n"
@@ -446,7 +444,6 @@ DEFUN (ripng_redistribute_type_metric_routemap,
   return CMD_SUCCESS;
 }
 
-
 void
 ripng_redistribute_write (struct vty *vty, int config_mode)
 {
diff --git a/solaris/prototype.daemons.in b/solaris/prototype.daemons.in
index ce65d5e35..8a906c9d0 100644
--- a/solaris/prototype.daemons.in
+++ b/solaris/prototype.daemons.in
@@ -8,7 +8,7 @@ f none @sbindir@/ripd=$DESTDIR/@sbindir@/ripd 0755 root bin
 f none @sbindir@/ripngd=$DESTDIR/@sbindir@/ripngd 0755 root bin
 f none @sbindir@/ospfd=$DESTDIR/@sbindir@/ospfd 0755 root bin
 f none @sbindir@/ospf6d=$DESTDIR/@sbindir@/ospf6d 0755 root bin
-f none @sbindir@/watchquagga=$DESTDIR/@sbindir@/watchquagga 0755 root bin
+f none @sbindir@/watchfrr=$DESTDIR/@sbindir@/watchfrr 0755 root bin
 d none @sysconfdir@=$DESTDIR/@sysconfdir@ 0711 @enable_user@ @enable_group@
 f none @sysconfdir@/zebra.conf.sample=$DESTDIR/@sysconfdir@/zebra.conf.sample 0644 root bin
 f none @sysconfdir@/bgpd.conf.sample=$DESTDIR/@sysconfdir@/bgpd.conf.sample 0644 root bin
diff --git a/tests/bgp_mpath_test.c b/tests/bgp_mpath_test.c
index 723f2977d..f9eb1534f 100644
--- a/tests/bgp_mpath_test.c
+++ b/tests/bgp_mpath_test.c
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * BGP Multipath Unit Test
  * Copyright (C) 2010 Google Inc.
  *
diff --git a/tests/main.c b/tests/main.c
index 885b8a292..b3e6e706f 100644
--- a/tests/main.c
+++ b/tests/main.c
@@ -92,7 +92,7 @@ Daemon which does 'slow' things.\n\n\
 -v, --version      Print program version\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
   exit (status);
 }
diff --git a/tests/table_test.c b/tests/table_test.c
index ee8192707..4042e1aaa 100644
--- a/tests/table_test.c
+++ b/tests/table_test.c
@@ -1,5 +1,4 @@
-/* $QuaggaId: Format:%an, %ai, %h$ $
- *
+/*
  * Routing table test
  * Copyright (C) 2012 OSR.
  *
diff --git a/tests/test-privs.c b/tests/test-privs.c
index e0118a881..c6ccc28e7 100644
--- a/tests/test-privs.c
+++ b/tests/test-privs.c
@@ -37,9 +37,9 @@ zebra_capabilities_t _caps_p [] =
 
 struct zebra_privs_t test_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #if defined(VTY_GROUP)
   .vty_group = VTY_GROUP,
@@ -71,7 +71,7 @@ Daemon which does 'slow' things.\n\n\
 -g, --group        Group to run as\n\
 -h, --help         Display this help and exit\n\
 \n\
-Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
   exit (status);
 }
diff --git a/tools/Makefile.am b/tools/Makefile.am
index c5dbba5a8..97ca27039 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -6,7 +6,7 @@ bin_PROGRAMS = permutations
 permutations_SOURCES = permutations.c
 permutations_LDADD = ../lib/libzebra.la
 
-sbin_SCRIPTS = quagga-reload.py quagga
+sbin_SCRIPTS = frr-reload.py frr
 
-EXTRA_DIST = quagga.service quagga-reload.py quagga
+EXTRA_DIST = frr.service frr-reload.py frr
 
diff --git a/tools/quagga b/tools/frr
index e8595d787..2ecaadbb5 100755
--- a/tools/quagga
+++ b/tools/frr
@@ -1,34 +1,34 @@
 #!/bin/bash
 #
 ### BEGIN INIT INFO
-# Provides: quagga
+# Provides: frr
 # Required-Start: $local_fs $network $remote_fs $syslog
 # Required-Stop: $local_fs $network $remote_fs $syslog
 # Default-Start:  2 3 4 5
 # Default-Stop: 0 1 6
-# Short-Description: start and stop the Quagga routing suite
-# Description: Quagga is a routing suite for IP routing protocols like
+# Short-Description: start and stop the Frr routing suite
+# Description: Frr is a routing suite for IP routing protocols like
 #              BGP, OSPF, RIP and others. This script contols the main
-#              daemon "quagga" as well as the individual protocol daemons.
+#              daemon "frr" as well as the individual protocol daemons.
 ### END INIT INFO
 #
 
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-D_PATH=/usr/lib/quagga
-C_PATH=/etc/quagga
-V_PATH=/var/run/quagga
+D_PATH=/usr/lib/frr
+C_PATH=/etc/frr
+V_PATH=/var/run/frr
 
-# Local Daemon selection may be done by using /etc/quagga/daemons.
-# See /usr/share/doc/quagga/README.Debian.gz for further information.
-# Keep zebra first and do not list watchquagga!
+# Local Daemon selection may be done by using /etc/frr/daemons.
+# See /usr/share/doc/frr/README.Debian.gz for further information.
+# Keep zebra first and do not list watchfrr!
 DAEMONS="zebra bgpd ripd ripngd ospfd ospf6d isisd babeld pimd"
 MAX_INSTANCES=5
-RELOAD_SCRIPT=/usr/lib/quagga/quagga-reload.py
+RELOAD_SCRIPT=/usr/lib/frr/frr-reload.py
 
 . /lib/lsb/init-functions
 
-if [ -f /usr/lib/quagga/ssd ]; then
-    SSD=/usr/lib/quagga/ssd
+if [ -f /usr/lib/frr/ssd ]; then
+    SSD=/usr/lib/frr/ssd
 else
     SSD=`which start-stop-daemon`
 fi
@@ -61,7 +61,7 @@ started()
 vtysh_b ()
 {
         # Rember, that all variables have been incremented by 1 in convert_daemon_prios()
-        if [ "$vtysh_enable" = 2 -a -f $C_PATH/Quagga.conf ]; then
+        if [ "$vtysh_enable" = 2 -a -f $C_PATH/Frr.conf ]; then
                 /usr/bin/vtysh -b -n
         fi
 }
@@ -73,13 +73,13 @@ vtysh_b ()
 check_daemon()
 {
         # If the integrated config file is used the others are not checked.
-        if [ -r "$C_PATH/Quagga.conf" ]; then
+        if [ -r "$C_PATH/Frr.conf" ]; then
           return 0
         fi
 
         # vtysh_enable has no config file nor binary so skip check.
         # (Not sure why vtysh_enable is in this list but does not hurt)
-        if [ $1 != "watchquagga" -a $1 != "vtysh_enable" ]; then
+        if [ $1 != "watchfrr" -a $1 != "vtysh_enable" ]; then
           # check for daemon binary
           if [ ! -x "$D_PATH/$1" ]; then return 1; fi
 
@@ -87,44 +87,44 @@ check_daemon()
           if [ -n "$2" ]; then
            if [ ! -r "$C_PATH/$1-$2.conf" ]; then
                 touch "$C_PATH/$1-$2.conf"
-                chown quagga:quagga "$C_PATH/$1-$2.conf"
+                chown frr:frr "$C_PATH/$1-$2.conf"
            fi
           elif [ ! -r "$C_PATH/$1.conf" ]; then
             touch "$C_PATH/$1.conf"
-            chown quagga:quagga "$C_PATH/$1.conf"
+            chown frr:frr "$C_PATH/$1.conf"
           fi
         fi
         return 0
 }
 
 # Starts the server if it's not alrady running according to the pid file.
-# The Quagga daemons creates the pidfile when starting.
+# The Frr daemons creates the pidfile when starting.
 start()
 {
        ulimit -n $MAX_FDS
-        if [ "$1" = "watchquagga" ]; then
+        if [ "$1" = "watchfrr" ]; then
 
-           # We may need to restart watchquagga if new daemons are added and/or
+           # We may need to restart watchfrr if new daemons are added and/or
            # removed
            if started "$1" ; then
-               stop watchquagga
+               stop watchfrr
            else
-               # Echo only once. watchquagga is printed in the stop above
+               # Echo only once. watchfrr is printed in the stop above
                echo -n " $1"
            fi
 
-           if [ -e /var/run/quagga/watchquagga.started ] ; then
-             rm /var/run/quagga/watchquagga.started
+           if [ -e /var/run/frr/watchfrr.started ] ; then
+             rm /var/run/frr/watchfrr.started
            fi
             ${SSD} \
                 --start \
                 --pidfile=`pidfile $1` \
                 --exec "$D_PATH/$1" \
                 -- \
-                "${watchquagga_options[@]}"
+                "${watchfrr_options[@]}"
             for i in `seq 1 10`;
             do
-              if [ -e /var/run/quagga/watchquagga.started ] ; then
+              if [ -e /var/run/frr/watchfrr.started ] ; then
 		  break
               else
                   sleep 1
@@ -200,10 +200,10 @@ stop()
     fi
 }
 
-# Converts values from /etc/quagga/daemons to all-numeric values.
+# Converts values from /etc/frr/daemons to all-numeric values.
 convert_daemon_prios()
 {
-        for name in $DAEMONS zebra vtysh_enable watchquagga_enable; do
+        for name in $DAEMONS zebra vtysh_enable watchfrr_enable; do
           # First, assign the value set by the user to $value
           eval value=\${${name}:0:3}
 
@@ -224,8 +224,8 @@ convert_daemon_prios()
         done
 }
 
-# Starts watchquagga for all wanted daemons.
-start_watchquagga()
+# Starts watchfrr for all wanted daemons.
+start_watchfrr()
 {
     local daemon_name
     local daemon_prio
@@ -233,14 +233,14 @@ start_watchquagga()
     local daemon_inst
 
     # Start the monitor daemon only if desired.
-    if [ 0 -eq "$watchquagga_enable" ]; then
+    if [ 0 -eq "$watchfrr_enable" ]; then
         return
     fi
 
     # Check variable type
-    if ! declare -p watchquagga_options | grep -q '^declare \-a'; then
+    if ! declare -p watchfrr_options | grep -q '^declare \-a'; then
       echo
-      echo "ERROR: The variable watchquagga_options from /etc/quagga/debian.cnf must be a BASH array!"
+      echo "ERROR: The variable watchfrr_options from /etc/frr/debian.cnf must be a BASH array!"
       echo "ERROR: Please convert config file and restart!"
       exit 1
     fi
@@ -256,13 +256,13 @@ start_watchquagga()
                  eval "inst_disable=\${${daemon_name}_${inst}}"
                  if [ -z ${inst_disable} ] || [ ${inst_disable} != 0 ]; then
                      if check_daemon $daemon_name $inst; then
-                         watchquagga_options+=("${daemon_name}-${inst}")
+                         watchfrr_options+=("${daemon_name}-${inst}")
                      fi
                  fi
              done
           else
               if check_daemon $daemon_name; then
-                  watchquagga_options+=($daemon_name)
+                  watchfrr_options+=($daemon_name)
               fi
            fi
            found_one=1
@@ -271,17 +271,17 @@ start_watchquagga()
 
     # Start if at least one daemon is activated.
     if [ $found_one -eq 1 ]; then
-      echo -n "Starting Quagga monitor daemon:"
-      start watchquagga
+      echo -n "Starting Frr monitor daemon:"
+      start watchfrr
       echo "."
     fi
 }
 
-# Stopps watchquagga.
-stop_watchquagga()
+# Stopps watchfrr.
+stop_watchfrr()
 {
-    echo -n "Stopping Quagga monitor daemon:"
-    stop watchquagga
+    echo -n "Stopping Frr monitor daemon:"
+    stop watchfrr
     echo "."
 }
 
@@ -305,7 +305,7 @@ stop_prio()
         wanted_prio=$1
         daemon_list=${daemon:-$DAEMONS}
 
-        echo -n "Stopping Quagga daemons (prio:$wanted_prio):"
+        echo -n "Stopping Frr daemons (prio:$wanted_prio):"
 
         for prio_i in `seq 10 -1 $wanted_prio`; do
             for daemon_name in $daemon_list; do
@@ -331,7 +331,7 @@ stop_prio()
         echo "."
        if [ -z "$inst" ]; then
        # Now stop other daemons that're prowling, coz the daemons file changed
-           echo -n "Stopping other quagga daemons"
+           echo -n "Stopping other frr daemons"
             if [ -n "$daemon" ]; then
                eval "file_list_suffix="$V_PATH"/"$daemon*""
            else
@@ -374,7 +374,7 @@ start_prio()
         wanted_prio=$1
         daemon_list=${daemon:-$DAEMONS}
 
-        echo -n "Starting Quagga daemons (prio:$wanted_prio):"
+        echo -n "Starting Frr daemons (prio:$wanted_prio):"
 
         for prio_i in `seq 1 $wanted_prio`; do
             for daemon_name in $daemon_list; do
@@ -479,7 +479,7 @@ check_status()
 . "$C_PATH/debian.conf"
 
 # Read configuration variable file if it is present
-[ -r /etc/default/quagga ] && . /etc/default/quagga
+[ -r /etc/default/frr ] && . /etc/default/frr
 
 MAX_INSTANCES=${MAX_INSTANCES:=5}
 
@@ -489,7 +489,7 @@ convert_daemon_prios
 if [ ! -d $V_PATH ]; then
     echo "Creating $V_PATH"
     mkdir -p $V_PATH
-    chown quagga:quagga $V_PATH
+    chown frr:frr $V_PATH
     chmod 755 /$V_PATH
 fi
 
@@ -509,10 +509,10 @@ case "$1" in
 
         # Start all daemons
         cd $C_PATH/
-        if [ "$2" != "watchquagga" ]; then
+        if [ "$2" != "watchfrr" ]; then
           start_prio 10 $dmn
         fi
-        start_watchquagga
+        start_watchfrr
         vtysh_b
         ;;
 
@@ -525,8 +525,8 @@ case "$1" in
 
     stop|0)
         # Stop all daemons at level '0' or 'stop'
-        stop_watchquagga
-        if [ "$dmn" != "watchquagga" ]; then
+        stop_watchfrr
+        if [ "$dmn" != "watchfrr" ]; then
          [ -n "${dmn}" ] && eval "${dmn/-/_}=0"
           stop_prio 0 $dmn
         fi
@@ -536,17 +536,17 @@ case "$1" in
           ip route flush proto zebra
        else
          [ -n "$dmn" ] && eval "${dmn/-/_}=0"
-         start_watchquagga
+         start_watchfrr
         fi
         ;;
 
     reload)
        # Just apply the commands that have changed, no restart necessary
-       [ ! -x "$RELOAD_SCRIPT" ] && echo "quagga-reload script not available" && exit 0
-       NEW_CONFIG_FILE="${2:-$C_PATH/Quagga.conf}"
+       [ ! -x "$RELOAD_SCRIPT" ] && echo "frr-reload script not available" && exit 0
+       NEW_CONFIG_FILE="${2:-$C_PATH/Frr.conf}"
        [ ! -r $NEW_CONFIG_FILE ] && echo "Unable to read new configuration file $NEW_CONFIG_FILE" && exit 1
-       echo "Applying only incremental changes to running configuration from Quagga.conf"
-       "$RELOAD_SCRIPT" --reload /etc/quagga/Quagga.conf
+       echo "Applying only incremental changes to running configuration from Frr.conf"
+       "$RELOAD_SCRIPT" --reload /etc/frr/Frr.conf
        exit $?
        ;;
 
@@ -562,11 +562,11 @@ case "$1" in
         ;;
 
     *)
-        echo "Usage: /etc/init.d/quagga {start|stop|status|reload|restart|force-reload|<priority>} [daemon]"
-        echo "       E.g. '/etc/init.d/quagga 5' would start all daemons with a prio 1-5."
+        echo "Usage: /etc/init.d/frr {start|stop|status|reload|restart|force-reload|<priority>} [daemon]"
+        echo "       E.g. '/etc/init.d/frr 5' would start all daemons with a prio 1-5."
        echo "       reload applies only modifications from the running config to all daemons."
        echo "       reload neither restarts starts any daemon nor starts any new ones."
-        echo "       Read /usr/share/doc/quagga/README.Debian for details."
+        echo "       Read /usr/share/doc/frr/README.Debian for details."
         exit 1
         ;;
 esac
diff --git a/tools/quagga-reload.py b/tools/frr-reload.py
index 4d6e9259f..463784de1 100755
--- a/tools/quagga-reload.py
+++ b/tools/frr-reload.py
@@ -1,30 +1,30 @@
 #!/usr/bin/python
-# Quagga Reloader
+# Frr Reloader
 # Copyright (C) 2014 Cumulus Networks, Inc.
 #
-# This file is part of Quagga.
+# This file is part of Frr.
 #
-# Quagga is free software; you can redistribute it and/or modify it
+# Frr is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by the
 # Free Software Foundation; either version 2, or (at your option) any
 # later version.
 #
-# Quagga is distributed in the hope that it will be useful, but
+# Frr is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with Quagga; see the file COPYING.  If not, write to the Free
+# along with Frr; see the file COPYING.  If not, write to the Free
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #  02111-1307, USA.
 #
 """
 This program
-- reads a quagga configuration text file
-- reads quagga's current running configuration via "vtysh -c 'show running'"
+- reads a frr configuration text file
+- reads frr's current running configuration via "vtysh -c 'show running'"
 - compares the two configs and determines what commands to execute to
-  synchronize quagga's running configuration with the configuation in the
+  synchronize frr's running configuration with the configuation in the
   text file
 """
 
@@ -52,7 +52,7 @@ class VtyshMarkException(Exception):
 class Context(object):
 
     """
-    A Context object represents a section of quagga configuration such as:
+    A Context object represents a section of frr configuration such as:
 !
 interface swp3
  description swp3 -> r8's swp1
@@ -91,7 +91,7 @@ ip forwarding
 class Config(object):
 
     """
-    A quagga configuration is stored in a Config object. A Config object
+    A frr configuration is stored in a Config object. A Config object
     contains a dictionary of Context objects where the Context keys
     ('router ospf' for example) are our dictionary key.
     """
@@ -394,7 +394,7 @@ def line_to_vtysh_conft(ctx_keys, line, delete):
 
 def line_for_vtysh_file(ctx_keys, line, delete):
     """
-    Return the command as it would appear in Quagga.conf
+    Return the command as it would appear in Frr.conf
     """
     cmd = []
 
@@ -435,7 +435,7 @@ def line_for_vtysh_file(ctx_keys, line, delete):
 
 def get_normalized_ipv6_line(line):
     """
-    Return a normalized IPv6 line as produced by quagga,
+    Return a normalized IPv6 line as produced by frr,
     with all letters in lower case and trailing and leading
     zeros removed
     """
@@ -473,14 +473,14 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
         if ctx_keys[0].startswith('router bgp') and line and line.startswith('neighbor '):
             """
             BGP changed how it displays swpX peers that are part of peer-group. Older
-            versions of quagga would display these on separate lines:
+            versions of frr would display these on separate lines:
                 neighbor swp1 interface
                 neighbor swp1 peer-group FOO
 
             but today we display via a single line
                 neighbor swp1 interface peer-group FOO
 
-            This change confuses quagga-reload.py so check to see if we are deleting
+            This change confuses frr-reload.py so check to see if we are deleting
                 neighbor swp1 interface peer-group FOO
 
             and adding
@@ -531,7 +531,7 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
 
             """
             In 3.0.1 we changed how we display neighbor interface command. Older
-            versions of quagga would display the following:
+            versions of frr would display the following:
                 neighbor swp1 interface
                 neighbor swp1 remote-as external
                 neighbor swp1 capability extended-nexthop
@@ -542,7 +542,7 @@ def ignore_delete_re_add_lines(lines_to_add, lines_to_del):
             and capability extended-nexthop is no longer needed because we
             automatically enable it when the neighbor is of type interface.
 
-            This change confuses quagga-reload.py so check to see if we are deleting
+            This change confuses frr-reload.py so check to see if we are deleting
                 neighbor swp1 interface remote-as (external|internal|ASNUM)
 
             and adding
@@ -689,19 +689,19 @@ def compare_context_objects(newconf, running):
 
 if __name__ == '__main__':
     # Command line options
-    parser = argparse.ArgumentParser(description='Dynamically apply diff in quagga configs')
+    parser = argparse.ArgumentParser(description='Dynamically apply diff in frr configs')
     parser.add_argument('--input', help='Read running config from file instead of "show running"')
     group = parser.add_mutually_exclusive_group(required=True)
     group.add_argument('--reload', action='store_true', help='Apply the deltas', default=False)
     group.add_argument('--test', action='store_true', help='Show the deltas', default=False)
     parser.add_argument('--debug', action='store_true', help='Enable debugs', default=False)
     parser.add_argument('--stdout', action='store_true', help='Log to STDOUT', default=False)
-    parser.add_argument('filename', help='Location of new quagga config file')
+    parser.add_argument('filename', help='Location of new frr config file')
     args = parser.parse_args()
 
     # Logging
     # For --test log to stdout
-    # For --reload log to /var/log/quagga/quagga-reload.log
+    # For --reload log to /var/log/frr/frr-reload.log
     if args.test or args.stdout:
         logging.basicConfig(level=logging.INFO,
                             format='%(asctime)s %(levelname)5s: %(message)s')
@@ -711,10 +711,10 @@ if __name__ == '__main__':
         logging.addLevelName(logging.WARNING, "\033[91m%s\033[0m" % logging.getLevelName(logging.WARNING))
 
     elif args.reload:
-        if not os.path.isdir('/var/log/quagga/'):
-            os.makedirs('/var/log/quagga/')
+        if not os.path.isdir('/var/log/frr/'):
+            os.makedirs('/var/log/frr/')
 
-        logging.basicConfig(filename='/var/log/quagga/quagga-reload.log',
+        logging.basicConfig(filename='/var/log/frr/frr-reload.log',
                             level=logging.INFO,
                             format='%(asctime)s %(levelname)5s: %(message)s')
 
@@ -733,7 +733,7 @@ if __name__ == '__main__':
         sys.exit(1)
 
     # Verify that 'service integrated-vtysh-config' is configured
-    vtysh_filename = '/etc/quagga/vtysh.conf'
+    vtysh_filename = '/etc/frr/vtysh.conf'
     service_integrated_vtysh_config = True
 
     if os.path.isfile(vtysh_filename):
@@ -746,7 +746,7 @@ if __name__ == '__main__':
                     break
 
     if not service_integrated_vtysh_config:
-        print "'service integrated-vtysh-config' is not configured, this is required for 'service quagga reload'"
+        print "'service integrated-vtysh-config' is not configured, this is required for 'service frr reload'"
         sys.exit(1)
 
     if args.debug:
@@ -799,7 +799,7 @@ if __name__ == '__main__':
 
     elif args.reload:
 
-        log.debug('New Quagga Config\n%s', newconf.get_lines())
+        log.debug('New Frr Config\n%s', newconf.get_lines())
 
         # This looks a little odd but we have to do this twice...here is why
         # If the user had this running bgp config:
@@ -826,7 +826,7 @@ if __name__ == '__main__':
         for x in range(2):
             running = Config()
             running.load_from_show_running()
-            log.debug('Running Quagga Config (Pass #%d)\n%s', x, running.get_lines())
+            log.debug('Running Frr Config (Pass #%d)\n%s', x, running.get_lines())
 
             (lines_to_add, lines_to_del) = compare_context_objects(newconf, running)
 
@@ -842,19 +842,19 @@ if __name__ == '__main__':
                     cmd = line_to_vtysh_conft(ctx_keys, line, True)
                     original_cmd = cmd
 
-                    # Some commands in quagga are picky about taking a "no" of the entire line.
+                    # Some commands in frr are picky about taking a "no" of the entire line.
                     # OSPF is bad about this, you can't "no" the entire line, you have to "no"
                     # only the beginning. If we hit one of these command an exception will be
                     # thrown.  Catch it and remove the last '-c', 'FOO' from cmd and try again.
                     #
                     # Example:
-                    # quagga(config-if)# ip ospf authentication message-digest 1.1.1.1
-                    # quagga(config-if)# no ip ospf authentication message-digest 1.1.1.1
+                    # frr(config-if)# ip ospf authentication message-digest 1.1.1.1
+                    # frr(config-if)# no ip ospf authentication message-digest 1.1.1.1
                     #  % Unknown command.
-                    # quagga(config-if)# no ip ospf authentication message-digest
+                    # frr(config-if)# no ip ospf authentication message-digest
                     #  % Unknown command.
-                    # quagga(config-if)# no ip ospf authentication
-                    # quagga(config-if)#
+                    # frr(config-if)# no ip ospf authentication
+                    # frr(config-if)#
 
                     while True:
                         try:
@@ -895,7 +895,7 @@ if __name__ == '__main__':
                                             string.ascii_uppercase +
                                             string.digits) for _ in range(6))
 
-                    filename = "/var/run/quagga/reload-%s.txt" % random_string
+                    filename = "/var/run/frr/reload-%s.txt" % random_string
                     log.info("%s content\n%s" % (filename, pformat(lines_to_configure)))
 
                     with open(filename, 'w') as fh:
diff --git a/tools/quagga.service b/tools/frr.service
index a2c1df38d..efc23ece8 100644
--- a/tools/quagga.service
+++ b/tools/frr.service
@@ -1,11 +1,11 @@
 [Unit]
-Description=Cumulus Linux Quagga
+Description=Cumulus Linux FRR
 After=syslog.target networking.service
 OnFailure=heartbeat-failed@%n.service
 
 [Service]
 Nice=-5
-EnvironmentFile=/etc/default/quagga
+EnvironmentFile=/etc/default/frr
 Type=forking
 NotifyAccess=all
 StartLimitInterval=3m
@@ -15,8 +15,8 @@ WatchdogSec=60s
 RestartSec=5
 Restart=on-abnormal
 LimitNOFILE=1024
-ExecStart=/usr/lib/quagga/quagga start
-ExecStop=/usr/lib/quagga/quagga stop
-ExecReload=/usr/lib/quagga/quagga-reload.py --reload /etc/quagga/Quagga.conf
+ExecStart=/usr/lib/frr/frr start
+ExecStop=/usr/lib/frr/frr stop
+ExecReload=/usr/lib/frr/frr-reload.py --reload /etc/frr/Frr.conf
 [Install]
 WantedBy=network-online.target
diff --git a/vtysh/Makefile.am b/vtysh/Makefile.am
index 0ff2d738f..090382b99 100644
--- a/vtysh/Makefile.am
+++ b/vtysh/Makefile.am
@@ -86,7 +86,7 @@ vtysh_cmd_FILES = $(vtysh_scan) \
 	          $(top_srcdir)/zebra/zebra_fpm.c \
 		  $(top_srcdir)/zebra/zebra_ptm.c \
 		  $(top_srcdir)/zebra/zebra_mpls_vty.c \
-		  $(top_srcdir)/watchquagga/watchquagga_vty.c \
+		  $(top_srcdir)/watchfrr/watchfrr_vty.c \
 	          $(BGP_VNC_RFAPI_SRC) $(BGP_VNC_RFP_SRC)
 
 vtysh_cmd.c: $(vtysh_cmd_FILES) extract.pl
diff --git a/vtysh/vtysh.c b/vtysh/vtysh.c
index f67fc1f31..910747c96 100644
--- a/vtysh/vtysh.c
+++ b/vtysh/vtysh.c
@@ -73,7 +73,7 @@ struct vtysh_client vtysh_client[] =
   { .fd = -1, .name = "bgpd", .flag = VTYSH_BGPD, .path = BGP_VTYSH_PATH, .next = NULL},
   { .fd = -1, .name = "isisd", .flag = VTYSH_ISISD, .path = ISIS_VTYSH_PATH, .next = NULL},
   { .fd = -1, .name = "pimd", .flag = VTYSH_PIMD, .path = PIM_VTYSH_PATH, .next = NULL},
-  { .fd = -1, .name = "watchquagga", .flag = VTYSH_WATCHQUAGGA, .path = WATCHQUAGGA_VTYSH_PATH, .next = NULL},
+  { .fd = -1, .name = "watchfrr", .flag = VTYSH_WATCHFRR, .path = WATCHFRR_VTYSH_PATH, .next = NULL},
 };
 
 enum vtysh_write_integrated vtysh_write_integrated = WRITE_INTEGRATED_UNSPECIFIED;
@@ -2430,21 +2430,21 @@ vtysh_write_config_integrated(void)
       err++;
     }
 
-  pwentry = getpwnam (QUAGGA_USER);
+  pwentry = getpwnam (FRR_USER);
   if (pwentry)
     uid = pwentry->pw_uid;
   else
     {
-      printf ("%% Warning: could not look up user \"%s\"\n", QUAGGA_USER);
+      printf ("%% Warning: could not look up user \"%s\"\n", FRR_USER);
       err++;
     }
 
-  grentry = getgrnam (QUAGGA_GROUP);
+  grentry = getgrnam (FRR_GROUP);
   if (grentry)
     gid = grentry->gr_gid;
   else
     {
-      printf ("%% Warning: could not look up group \"%s\"\n", QUAGGA_GROUP);
+      printf ("%% Warning: could not look up group \"%s\"\n", FRR_GROUP);
       err++;
     }
 
@@ -2514,7 +2514,7 @@ DEFUN (vtysh_write_memory,
     {
       ret = CMD_WARNING;
       for (i = 0; i < array_size(vtysh_client); i++)
-        if (vtysh_client[i].flag == VTYSH_WATCHQUAGGA)
+        if (vtysh_client[i].flag == VTYSH_WATCHFRR)
           break;
       if (i < array_size(vtysh_client) && vtysh_client[i].fd != -1)
         ret = vtysh_client_execute (&vtysh_client[i], "write integrated", stdout);
@@ -2522,7 +2522,7 @@ DEFUN (vtysh_write_memory,
       if (ret != CMD_SUCCESS)
         {
           printf("\nWarning: attempting direct configuration write without "
-                 "watchquagga.\nFile permissions and ownership may be "
+                 "watchfrr.\nFile permissions and ownership may be "
                  "incorrect, or write may fail.\n\n");
           ret = vtysh_write_config_integrated();
         }
@@ -2902,8 +2902,8 @@ vtysh_update_all_insances(struct vtysh_client * head_client)
 
   if (head_client->flag != VTYSH_OSPFD) return;
 
-  /* ls /var/run/quagga/ and look for all files ending in .vty */
-  dir = opendir("/var/run/quagga/");
+  /* ls DAEMON_VTY_DIR and look for all files ending in .vty */
+  dir = opendir(DAEMON_VTY_DIR "/");
   if (dir)
     {
       while ((file = readdir(dir)) != NULL)
@@ -2913,7 +2913,8 @@ vtysh_update_all_insances(struct vtysh_client * head_client)
               if (n == MAXIMUM_INSTANCES)
                 {
                   fprintf(stderr,
-                          "Parsing /var/run/quagga/, client limit(%d) reached!\n", n);
+                          "Parsing %s/, client limit(%d) reached!\n",
+                          DAEMON_VTY_DIR, n);
                   break;
                 }
               client = (struct vtysh_client *) malloc(sizeof(struct vtysh_client));
@@ -2921,7 +2922,7 @@ vtysh_update_all_insances(struct vtysh_client * head_client)
 	      client->name = "ospfd";
               client->flag = VTYSH_OSPFD;
               ptr = (char *) malloc(100);
-              sprintf(ptr, "/var/run/quagga/%s", file->d_name);
+              sprintf(ptr, "%s/%s", DAEMON_VTY_DIR, file->d_name);
 	      client->path = (const char *)ptr;
               client->next = NULL;
               vtysh_client_sorted_insert(head_client, client);
diff --git a/vtysh/vtysh.h b/vtysh/vtysh.h
index dade049ad..46ed00191 100644
--- a/vtysh/vtysh.h
+++ b/vtysh/vtysh.h
@@ -34,11 +34,11 @@ DECLARE_MGROUP(MVTYSH)
 #define VTYSH_ISISD  0x40
 #define VTYSH_PIMD   0x100
 #define VTYSH_LDPD   0x200
-#define VTYSH_WATCHQUAGGA 0x400
+#define VTYSH_WATCHFRR 0x400
 
 /* commands in REALLYALL are crucial to correct vtysh operation */
 #define VTYSH_REALLYALL	  ~0U
-/* watchquagga is not in ALL since library CLI functions should not be
+/* watchfrr is not in ALL since library CLI functions should not be
  * run on it (logging & co. should stay in a fixed/frozen config, and
  * things like prefix lists are not even initialised) */
 #define VTYSH_ALL	  VTYSH_ZEBRA|VTYSH_RIPD|VTYSH_RIPNGD|VTYSH_OSPFD|VTYSH_OSPF6D|VTYSH_LDPD|VTYSH_BGPD|VTYSH_ISISD|VTYSH_PIMD
diff --git a/vtysh/vtysh_main.c b/vtysh/vtysh_main.c
index 999d90ab2..6b33fca39 100644
--- a/vtysh/vtysh_main.c
+++ b/vtysh/vtysh_main.c
@@ -150,7 +150,7 @@ usage (int status)
 	    "Note that multiple commands may be executed from the command\n" \
 	    "line by passing multiple -c args, or by embedding linefeed\n" \
 	    "characters in one or more of the commands.\n\n" \
-	    "Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+	    "Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
 
   exit (status);
 }
diff --git a/vtysh/vtysh_user.c b/vtysh/vtysh_user.c
index 0516f9914..132eaede2 100644
--- a/vtysh/vtysh_user.c
+++ b/vtysh/vtysh_user.c
@@ -67,7 +67,7 @@ vtysh_pam (const char *user)
   pam_handle_t *pamh = NULL;
 
   /* Start PAM. */
-  ret = pam_start(QUAGGA_PROGNAME, user, &conv, &pamh);
+  ret = pam_start(FRR_PAM_NAME, user, &conv, &pamh);
   /* printf ("ret %d\n", ret); */
 
   /* Is user really user? */
diff --git a/watchquagga/.gitignore b/watchfrr/.gitignore
index b6226d53d..d3b038feb 100644
--- a/watchquagga/.gitignore
+++ b/watchfrr/.gitignore
@@ -1,7 +1,7 @@
 Makefile
 Makefile.in
 *.o
-watchquagga
+watchfrr
 tags
 TAGS
 .deps
diff --git a/watchquagga/Makefile.am b/watchfrr/Makefile.am
index 43f743eba..51851b016 100644
--- a/watchquagga/Makefile.am
+++ b/watchfrr/Makefile.am
@@ -5,9 +5,9 @@ DEFS = @DEFS@ -DSTATEDIR=\"$(localstatedir)/\"
 
 AM_CFLAGS = $(WERROR)
 
-sbin_PROGRAMS = watchquagga
+sbin_PROGRAMS = watchfrr
 
-noinst_HEADERS = watchquagga.h
+noinst_HEADERS = watchfrr.h
 
-watchquagga_SOURCES = watchquagga.c watchquagga_vty.c
-watchquagga_LDADD = ../lib/libzebra.la @LIBCAP@
+watchfrr_SOURCES = watchfrr.c watchfrr_vty.c
+watchfrr_LDADD = ../lib/libzebra.la @LIBCAP@
diff --git a/watchquagga/watchquagga.c b/watchfrr/watchfrr.c
index 16b398030..903e2bbe9 100644
--- a/watchquagga/watchquagga.c
+++ b/watchfrr/watchfrr.c
@@ -1,5 +1,5 @@
 /*
-    Monitor status of quagga daemons and restart if necessary.
+    Monitor status of frr daemons and restart if necessary.
 
     Copyright (C) 2004  Andrew J. Schorr
 
@@ -33,7 +33,7 @@
 #include <memory.h>
 #include <systemd.h>
 
-#include "watchquagga.h"
+#include "watchfrr.h"
 
 #ifndef MIN
 #define MIN(X,Y) (((X) <= (Y)) ? (X) : (Y))
@@ -49,10 +49,10 @@
 #define DEFAULT_LOGLEVEL	LOG_INFO
 #define DEFAULT_MIN_RESTART	60
 #define DEFAULT_MAX_RESTART	600
-#ifdef PATH_WATCHQUAGGA_PID
-#define DEFAULT_PIDFILE		PATH_WATCHQUAGGA_PID
+#ifdef PATH_WATCHFRR_PID
+#define DEFAULT_PIDFILE		PATH_WATCHFRR_PID
 #else
-#define DEFAULT_PIDFILE		STATEDIR "/watchquagga.pid"
+#define DEFAULT_PIDFILE		STATEDIR "/watchfrr.pid"
 #endif
 #ifdef DAEMON_VTY_DIR
 #define VTYDIR			DAEMON_VTY_DIR
@@ -223,7 +223,7 @@ usage(const char *progname, int status)
   else
     {
       printf("Usage : %s [OPTION...] <daemon name> ...\n\n\
-Watchdog program to monitor status of quagga daemons and try to restart\n\
+Watchdog program to monitor status of frr daemons and try to restart\n\
 them if they are down or unresponsive.  It determines whether a daemon is\n\
 up based on whether it can connect to the daemon's vty unix stream socket.\n\
 It then repeatedly sends echo commands over that socket to determine whether\n\
@@ -706,10 +706,10 @@ daemon_send_ready (void)
 #if defined (HAVE_CUMULUS)
       FILE *fp;
 
-      fp = fopen("/var/run/quagga/watchquagga.started", "w");
+      fp = fopen(DAEMON_VTY_DIR "/watchfrr.started", "w");
       fclose(fp);
 #endif
-      zlog_notice ("Watchquagga: Notifying Systemd we are up and running");
+      zlog_notice ("Watchfrr: Notifying Systemd we are up and running");
       systemd_send_started(master, 0);
       sent = 1;
     }
@@ -1062,7 +1062,7 @@ translate_blanks(const char *cmd, const char *blankstr)
   return res;
 }
 
-struct zebra_privs_t watchquagga_privs =
+struct zebra_privs_t watchfrr_privs =
 {
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -1266,7 +1266,7 @@ main(int argc, char **argv)
 	  gs.unresponsive_restart = 1;
 	  break;
 	case 'v':
-	  printf ("%s version %s\n", progname, QUAGGA_VERSION);
+	  printf ("%s version %s\n", progname, FRR_VERSION);
 	  puts("Copyright 2004 Andrew J. Schorr");
 	  return 0;
         case 'h':
@@ -1325,14 +1325,14 @@ main(int argc, char **argv)
       
   gs.restart.interval = gs.min_restart_interval;
 
-  zprivs_init (&watchquagga_privs);
+  zprivs_init (&watchfrr_privs);
 
   master = thread_master_create();
   cmd_init(-1);
   memory_init();
   vty_init(master);
-  watchquagga_vty_init();
-  vty_serv_sock(NULL, 0, WATCHQUAGGA_VTYSH_PATH);
+  watchfrr_vty_init();
+  vty_serv_sock(NULL, 0, WATCHFRR_VTYSH_PATH);
 
   signal_init (master, array_size(my_signals), my_signals);
   srandom(time(NULL));
@@ -1384,7 +1384,7 @@ main(int argc, char **argv)
       return usage(progname,1);
     }
 
-  zlog_default = openzlog(progname, ZLOG_WATCHQUAGGA, 0,
+  zlog_default = openzlog(progname, ZLOG_WATCHFRR, 0,
 			  LOG_CONS|LOG_NDELAY|LOG_PID, LOG_DAEMON);
   zlog_set_level(NULL, ZLOG_DEST_MONITOR, ZLOG_DISABLED);
   if (daemon_mode)
@@ -1392,7 +1392,7 @@ main(int argc, char **argv)
       zlog_set_level(NULL, ZLOG_DEST_SYSLOG, MIN(gs.loglevel,LOG_DEBUG));
       if (daemon (0, 0) < 0)
 	{
-	  fprintf(stderr, "Watchquagga daemon failed: %s", strerror(errno));
+	  fprintf(stderr, "Watchfrr daemon failed: %s", strerror(errno));
 	  exit (1);
 	}
     }
@@ -1422,7 +1422,7 @@ main(int argc, char **argv)
 	  p += strlen(p);
 	}
       zlog_notice("%s %s watching [%s], mode [%s]",
-      		  progname, QUAGGA_VERSION, buf, mode_str[gs.mode]);
+		  progname, FRR_VERSION, buf, mode_str[gs.mode]);
     }
   }
 
diff --git a/watchquagga/watchquagga.h b/watchfrr/watchfrr.h
index ecadf22c5..4a479c72e 100644
--- a/watchquagga/watchquagga.h
+++ b/watchfrr/watchfrr.h
@@ -1,5 +1,5 @@
 /*
-    Common definitions for watchquagga API socket.
+    Common definitions for watchfrr API socket.
 
     Copyright (C) 2016  David Lamparter for NetDEF, Inc.
 
@@ -18,12 +18,12 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#ifndef QUAGGA_WATCHQUAGGA_H
-#define QUAGGA_WATCHQUAGGA_H
+#ifndef FRR_WATCHFRR_H
+#define FRR_WATCHFRR_H
 
-extern void watchquagga_vty_init(void);
+extern void watchfrr_vty_init(void);
 
 extern pid_t integrated_write_pid;
 extern void integrated_write_sigchld(int status);
 
-#endif /* QUAGGA_WATCHQUAGGA_H */
+#endif /* FRR_WATCHFRR_H */
diff --git a/watchquagga/watchquagga_vty.c b/watchfrr/watchfrr_vty.c
index b96011b76..4fffb020d 100644
--- a/watchquagga/watchquagga_vty.c
+++ b/watchfrr/watchfrr_vty.c
@@ -1,5 +1,5 @@
 /*
-    watchquagga CLI functions.
+    watchfrr CLI functions.
 
     Copyright (C) 2016  David Lamparter for NetDEF, Inc.
 
@@ -26,7 +26,7 @@
 #include "vty.h"
 #include "command.h"
 
-#include "watchquagga.h"
+#include "watchfrr.h"
 
 pid_t integrated_write_pid;
 static int integrated_result_fd;
@@ -35,7 +35,7 @@ DEFUN (config_write_integrated,
 	config_write_integrated_cmd,
 	"write integrated",
 	"Write running configuration to memory, network, or terminal\n"
-	"Write integrated all-daemon Quagga.conf file\n")
+	"Write integrated all-daemon Frr.conf file\n")
 {
 	pid_t child;
 	sigset_t oldmask, sigmask;
@@ -69,7 +69,7 @@ DEFUN (config_write_integrated,
 	/* note: the VTY won't write a command return value to vtysh;  the
 	 * session temporarily enters an intentional "hang" state.  This is
 	 * to make sure latency in vtysh doing the config write (several
-	 * seconds is not rare to see) does not interfere with watchquagga's
+	 * seconds is not rare to see) does not interfere with watchfrr's
 	 * supervisor job.
 	 *
 	 * The fd is duplicated here so we don't need to hold a vty pointer
@@ -127,7 +127,7 @@ void integrated_write_sigchld(int status)
 	integrated_write_pid = -1;
 }
 
-void watchquagga_vty_init(void)
+void watchfrr_vty_init(void)
 {
 	integrated_write_pid = -1;
 	install_element(ENABLE_NODE, &config_write_integrated_cmd);
diff --git a/zebra/client_main.c b/zebra/client_main.c
index 24bfa56d0..8290eafc4 100644
--- a/zebra/client_main.c
+++ b/zebra/client_main.c
@@ -1,6 +1,4 @@
 /*
- * $Quagga: $Format:%an, %ai, %h$ $
- *
  * GNU Zebra client test main routine.
  * Copyright (C) 1997 Kunihiro Ishiguro
  *
diff --git a/zebra/main.c b/zebra/main.c
index 4fea0104f..9abc8f87f 100644
--- a/zebra/main.c
+++ b/zebra/main.c
@@ -111,9 +111,9 @@ zebra_capabilities_t _caps_p [] =
 /* zebra privileges to run with */
 struct zebra_privs_t zserv_privs =
 {
-#if defined(QUAGGA_USER) && defined(QUAGGA_GROUP)
-  .user = QUAGGA_USER,
-  .group = QUAGGA_GROUP,
+#if defined(FRR_USER) && defined(FRR_GROUP)
+  .user = FRR_USER,
+  .group = FRR_GROUP,
 #endif
 #ifdef VTY_GROUP
   .vty_group = VTY_GROUP,
@@ -162,7 +162,7 @@ usage (char *progname, int status)
       printf ("-v, --version      Print program version\n"\
 	      "-h, --help         Display this help and exit\n"\
 	      "\n"\
-	      "Report bugs to %s\n", ZEBRA_BUG_ADDRESS);
+	      "Report bugs to %s\n", FRR_BUG_ADDRESS);
     }
 
   exit (status);
@@ -466,7 +466,7 @@ main (int argc, char **argv)
   vty_serv_sock (vty_addr, vty_port, ZEBRA_VTYSH_PATH);
 
   /* Print banner. */
-  zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+  zlog_notice ("Zebra %s starting: vty@%d", FRR_VERSION, vty_port);
 
   while (thread_fetch (zebrad.master, &thread))
     thread_call (&thread);
diff --git a/zebra/rib.h b/zebra/rib.h
index 30929f1be..d80ea6cbd 100644
--- a/zebra/rib.h
+++ b/zebra/rib.h
@@ -93,7 +93,6 @@ struct rib
   /* Nexthop information. */
   u_char nexthop_num;
   u_char nexthop_active_num;
-  u_char nexthop_fib_num;
 };
 
 /* meta-queue structure:
@@ -335,7 +334,7 @@ extern int zebra_check_addr (struct prefix *p);
 
 extern void rib_addnode (struct route_node *rn, struct rib *rib, int process);
 extern void rib_delnode (struct route_node *rn, struct rib *rib);
-extern int rib_install_kernel (struct route_node *rn, struct rib *rib, int update);
+extern int rib_install_kernel (struct route_node *rn, struct rib *rib, struct rib *old);
 extern int rib_uninstall_kernel (struct route_node *rn, struct rib *rib);
 
 /* NOTE:
diff --git a/zebra/test_main.c b/zebra/test_main.c
index 282932854..8b4ead8bd 100644
--- a/zebra/test_main.c
+++ b/zebra/test_main.c
@@ -108,7 +108,7 @@ usage (char *progname, int status)
               "-v, --version      Print program version\n"\
 	      "-h, --help         Display this help and exit\n"\
 	      "\n"\
-	      "Report bugs to %s\n", progname, ZEBRA_BUG_ADDRESS);
+	      "Report bugs to %s\n", progname, FRR_BUG_ADDRESS);
     }
 
   exit (status);
@@ -331,7 +331,7 @@ main (int argc, char **argv)
   vty_serv_sock (vty_addr, vty_port, "/tmp/test_zebra");
 
   /* Print banner. */
-  zlog_notice ("Zebra %s starting: vty@%d", QUAGGA_VERSION, vty_port);
+  zlog_notice ("Zebra %s starting: vty@%d", FRR_VERSION, vty_port);
 
   while (thread_fetch (zebrad.master, &thread))
     thread_call (&thread);
diff --git a/zebra/zebra_ptm.c b/zebra/zebra_ptm.c
index e6d13b507..c5223199a 100644
--- a/zebra/zebra_ptm.c
+++ b/zebra/zebra_ptm.c
@@ -38,6 +38,7 @@
 #include "vrf.h"
 #include "rib.h"
 #include "zebra_vrf.h"
+#include "version.h"
 
 #define ZEBRA_PTM_RECONNECT_TIME_INITIAL 1 /* initial reconnect is 1s */
 #define ZEBRA_PTM_RECONNECT_TIME_MAX     300
@@ -119,7 +120,7 @@ zebra_ptm_init (void)
   ptm_cb.pid = getpid();
   zebra_ptm_install_commands();
 
-  sprintf(buf, "%s", "quagga");
+  sprintf(buf, "%s", FRR_PTM_NAME);
   ptm_hdl = ptm_lib_register(buf, NULL, zebra_ptm_handle_msg_cb,
                                     zebra_ptm_handle_msg_cb);
   ptm_cb.wb = buffer_new(0);
diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c
index c573f6bd5..e48da0479 100644
--- a/zebra/zebra_rib.c
+++ b/zebra/zebra_rib.c
@@ -1212,7 +1212,7 @@ nexthop_active_update (struct route_node *rn, struct rib *rib, int set)
  * is only used for IPv4.
  */
 int
-rib_install_kernel (struct route_node *rn, struct rib *rib, int update)
+rib_install_kernel (struct route_node *rn, struct rib *rib, struct rib *old)
 {
   int ret = 0;
   struct nexthop *nexthop, *tnexthop;
@@ -1231,7 +1231,7 @@ rib_install_kernel (struct route_node *rn, struct rib *rib, int update)
    * the kernel.
    */
   zfpm_trigger_update (rn, "installing in kernel");
-  ret = kernel_route_rib (&rn->p, update ? rib : NULL, rib);
+  ret = kernel_route_rib (&rn->p, old, rib);
 
   /* If install succeeds, update FIB flag for nexthops. */
   if (!ret)
@@ -1388,7 +1388,7 @@ rib_process_add_fib(struct zebra_vrf *zvrf, struct route_node *rn,
 
   if (!RIB_SYSTEM_ROUTE (new))
     {
-      if (rib_install_kernel (rn, new, 0))
+      if (rib_install_kernel (rn, new, NULL))
         {
           inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
           zlog_warn ("%u:%s/%d: Route install failed",
@@ -1470,7 +1470,7 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn,
           /* Non-system route should be installed. */
           if (!RIB_SYSTEM_ROUTE (new))
             {
-              if (rib_install_kernel (rn, new, 1))
+              if (rib_install_kernel (rn, new, old))
                 {
                   installed = 0;
                   inet_ntop (rn->p.family, &rn->p.u.prefix, buf, INET6_ADDRSTRLEN);
@@ -1542,7 +1542,7 @@ rib_process_update_fib (struct zebra_vrf *zvrf, struct route_node *rn,
                 break;
               }
           if (!in_fib)
-            rib_install_kernel (rn, new, 0);
+            rib_install_kernel (rn, new, NULL);
         }
     }
 
@@ -2459,11 +2459,10 @@ void _rib_dump (const char * func,
   );
   zlog_debug
   (
-    "%s: nexthop_num == %u, nexthop_active_num == %u, nexthop_fib_num == %u",
+    "%s: nexthop_num == %u, nexthop_active_num == %u",
     func,
     rib->nexthop_num,
-    rib->nexthop_active_num,
-    rib->nexthop_fib_num
+    rib->nexthop_active_num
   );
 
   for (ALL_NEXTHOPS_RO(rib->nexthop, nexthop, tnexthop, recursing))
@@ -2779,7 +2778,7 @@ rib_delete (afi_t afi, safi_t safi, vrf_id_t vrf_id, int type, u_short instance,
 	    {
 	      /* This means someone else, other than Zebra, has deleted
 	       * a Zebra router from the kernel. We will add it back */
-	      rib_install_kernel(rn, fib, 0);
+	      rib_install_kernel(rn, fib, NULL);
 	    }
         }
       else
diff --git a/zebra/zebra_routemap.c b/zebra/zebra_routemap.c
index 111b55ff7..c467609f0 100644
--- a/zebra/zebra_routemap.c
+++ b/zebra/zebra_routemap.c
@@ -446,7 +446,7 @@ DEFUN (ip_protocol,
        "ip protocol <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> route-map ROUTE-MAP",
        IP_STR
        "Filter routing info exchanged between zebra and protocol\n"
-       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route-map\n"
        "Route map name\n")
 {
@@ -486,7 +486,7 @@ DEFUN (no_ip_protocol,
        NO_STR
        IP_STR
        "Stop filtering routing info between zebra and protocol\n"
-       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -521,7 +521,6 @@ DEFUN (no_ip_protocol,
   return CMD_SUCCESS;
 }
 
-
 DEFUN (show_ip_protocol,
        show_ip_protocol_cmd,
        "show ip protocol",
@@ -556,7 +555,7 @@ DEFUN (ipv6_protocol,
        "ipv6 protocol <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> route-map ROUTE-MAP",
        IP6_STR
        "Filter IPv6 routing info exchanged between zebra and protocol\n"
-       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -596,7 +595,7 @@ DEFUN (no_ipv6_protocol,
        NO_STR
        IP6_STR
        "Stop filtering IPv6 routing info between zebra and protocol\n"
-       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -630,7 +629,6 @@ DEFUN (no_ipv6_protocol,
   return CMD_SUCCESS;
 }
 
-
 DEFUN (show_ipv6_protocol,
        show_ipv6_protocol_cmd,
        "show ipv6 protocol",
@@ -665,7 +663,7 @@ DEFUN (ip_protocol_nht_rmap,
        "ip nht <kernel|connected|static|rip|ospf|isis|bgp|pim|table|any> route-map ROUTE-MAP",
        IP_STR
        "Filter Next Hop tracking route resolution\n"
-       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -702,7 +700,7 @@ DEFUN (no_ip_protocol_nht_rmap,
        NO_STR
        IP_STR
        "Filter Next Hop tracking route resolution\n"
-       QUAGGA_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -730,7 +728,6 @@ DEFUN (no_ip_protocol_nht_rmap,
   return CMD_SUCCESS;
 }
 
-
 DEFUN (show_ip_protocol_nht,
        show_ip_protocol_nht_cmd,
        "show ip nht route-map",
@@ -766,7 +763,7 @@ DEFUN (ipv6_protocol_nht_rmap,
        "ipv6 nht <kernel|connected|static|ripng|ospf6|isis|bgp|table|any> route-map ROUTE-MAP",
        IP6_STR
        "Filter Next Hop tracking route resolution\n"
-       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -797,7 +794,7 @@ DEFUN (no_ipv6_protocol_nht_rmap,
        NO_STR
        IP6_STR
        "Filter Next Hop tracking route resolution\n"
-       QUAGGA_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
+       FRR_IP6_PROTOCOL_MAP_HELP_STR_ZEBRA
        "Specify route map\n"
        "Route map name\n")
 {
@@ -832,7 +829,6 @@ DEFUN (no_ipv6_protocol_nht_rmap,
   return CMD_SUCCESS;
 }
 
-
 DEFUN (show_ipv6_protocol_nht,
        show_ipv6_protocol_nht_cmd,
        "show ipv6 nht route-map",
diff --git a/zebra/zebra_static.c b/zebra/zebra_static.c
index e6ae9c71d..76ef0c636 100644
--- a/zebra/zebra_static.c
+++ b/zebra/zebra_static.c
@@ -323,7 +323,7 @@ static_uninstall_route (afi_t afi, safi_t safi, struct prefix *p, struct static_
             {
               /* Update route in kernel if it's in fib */
               if (CHECK_FLAG(rib->status, RIB_ENTRY_SELECTED_FIB))
-              rib_install_kernel (rn, rib, 1);
+                rib_install_kernel (rn, rib, rib);
               /* Update redistribution if it's selected */
               if (CHECK_FLAG(rib->flags, ZEBRA_FLAG_SELECTED))
               redistribute_update (&rn->p, rib, NULL);
diff --git a/zebra/zebra_vty.c b/zebra/zebra_vty.c
index e5f9b17e8..ca37d2c7a 100644
--- a/zebra/zebra_vty.c
+++ b/zebra/zebra_vty.c
@@ -1473,7 +1473,7 @@ DEFUN (show_ip_route_protocol,
        IP_STR
        "IP routing table\n"
        VRF_CMD_HELP_STR
-       QUAGGA_IP_REDIST_HELP_STR_ZEBRA)
+       FRR_IP_REDIST_HELP_STR_ZEBRA)
 {
   int type;
   struct route_table *table;
@@ -2072,7 +2072,7 @@ DEFUN (show_ip_route_vrf_all_protocol,
        IP_STR
        "IP routing table\n"
        VRF_ALL_CMD_HELP_STR
-       QUAGGA_IP_REDIST_HELP_STR_ZEBRA"\n")
+       FRR_IP_REDIST_HELP_STR_ZEBRA"\n")
 {
   int type;
   struct route_table *table;
@@ -2956,7 +2956,7 @@ DEFUN (show_ipv6_route_protocol,
        IP_STR
        "IP routing table\n"
        VRF_CMD_HELP_STR
-       QUAGGA_IP6_REDIST_HELP_STR_ZEBRA)
+       FRR_IP6_REDIST_HELP_STR_ZEBRA)
 {
   int type;
   struct route_table *table;
@@ -3356,7 +3356,7 @@ DEFUN (show_ipv6_route_vrf_all_protocol,
        IP_STR
        "IP routing table\n"
        VRF_ALL_CMD_HELP_STR
-       QUAGGA_IP6_REDIST_HELP_STR_ZEBRA)
+       FRR_IP6_REDIST_HELP_STR_ZEBRA)
 {
   int idx_protocol = 5;
   int type;