diff --git a/configure.ac b/configure.ac
index 0eeeb627ba..04478f255b 100755
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,13 @@
 AC_PREREQ(2.60)
 
 AC_INIT(Quagga, 2.0-rc0, [https://bugzilla.quagga.net])
+PACKAGE_URL="http://www.quagga.net"
+PACKAGE_FULLNAME="Quagga"
+AC_SUBST(PACKAGE_FULLNAME)
+
 CONFIG_ARGS="$ac_configure_args"
 AC_SUBST(CONFIG_ARGS)
+
 AC_CONFIG_SRCDIR(lib/zebra.h)
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -1568,6 +1573,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
diff --git a/doc/bgpd.8.in b/doc/bgpd.8.in
index 7e90eaec5b..7047744635 100644
--- a/doc/bgpd.8.in
+++ 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/defines.texi.in b/doc/defines.texi.in
index 5436f20c36..43d7442939 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/isisd.8.in b/doc/isisd.8.in
index 83ac99d57a..9ffcbc618d 100644
--- a/doc/isisd.8.in
+++ 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/ldpd.8.in b/doc/ldpd.8.in
index 092ff39d49..1683de46ca 100644
--- a/doc/ldpd.8.in
+++ 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/ospf6d.8.in b/doc/ospf6d.8.in
index 630b20afdd..7f94782bea 100644
--- a/doc/ospf6d.8.in
+++ 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.in b/doc/ospfclient.8.in
index ccfad1aad0..fb996a541f 100644
--- a/doc/ospfclient.8.in
+++ 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.in b/doc/ospfd.8.in
index ba8848affa..1b86551ca5 100644
--- a/doc/ospfd.8.in
+++ 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/pimd.8.in b/doc/pimd.8.in
index 0dd170a2cd..60b844b1e7 100644
--- a/doc/pimd.8.in
+++ 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/quagga.1.in b/doc/quagga.1.in
index 35e8b30bf5..040187200f 100644
--- a/doc/quagga.1.in
+++ b/doc/quagga.1.in
@@ -1,4 +1,4 @@
-.TH Quagga 1 "27 July 2006" "Quagga Systemd Script" "Version 0.99.23.1"
+.TH Quagga 1 "27 July 2006" "@PACKAGE_FULLNAME@ Systemd Script" "Version @PACKAGE_VERSION@"
 .SH NAME
 quagga \- a systemd interaction script
 .SH SYNOPSIS
@@ -28,9 +28,9 @@ quagga \- a systemd interaction script
 ]
 .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
@@ -57,9 +57,9 @@ Status of all the daemons
 .SH BUGS
 .B quagga
 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/ripd.8.in b/doc/ripd.8.in
index f042af228b..6db5ac3649 100644
--- a/doc/ripd.8.in
+++ 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/ripngd.8.in b/doc/ripngd.8.in
index e4504fde46..4c5f2bb114 100644
--- a/doc/ripngd.8.in
+++ 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/vtysh.1.in b/doc/vtysh.1.in
index d144cb6421..35a05709eb 100644
--- a/doc/vtysh.1.in
+++ 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,7 +48,7 @@ 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.
@@ -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@/Quagga.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
 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/watchquagga.8.in b/doc/watchquagga.8.in
index ca9916461e..a7249b8376 100644
--- a/doc/watchquagga.8.in
+++ b/doc/watchquagga.8.in
@@ -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.in b/doc/zebra.8.in
index cb431da0aa..e7d00e10a3 100644
--- a/doc/zebra.8.in
+++ 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.