diff --git a/ChangeLog b/ChangeLog
index f333058..4db0bdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* Makefile.am: Only put pkgsrc dir in SUBDIRS if we should install
+	  rc.d files.  (Note that pkgsrc is always in DIST_SUBDIRS.)
+
+	* configure.ac (pkgsrcdir): add new --enable-pkgsrcrcdir to give a
+	  directory into which www.pkgsrc.org-style rc.d files are
+	  installed.
+
 2004-08-19 Paul Jakma <paul@dishone.st>
 
 	* Makefile.am: add m4 directory to EXTRA_DIST, and define 
diff --git a/Makefile.am b/Makefile.am
index f141f57..d620c99 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in.
 
 SUBDIRS = lib @ZEBRA@ @BGPD@ @RIPD@ @RIPNGD@ @OSPFD@ @OSPF6D@ \
-         @ISISD@ @VTYSH@ @OSPFCLIENT@ pkgsrc redhat doc
+         @ISISD@ @VTYSH@ @OSPFCLIENT@ @pkgsrcdir@ redhat doc
 
 DIST_SUBDIRS = lib zebra bgpd ripd ripngd ospfd ospf6d \
 	  isisd vtysh ospfclient doc pkgsrc redhat tests
diff --git a/configure.ac b/configure.ac
index df819ed..b44befa 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@
 ##  Copyright (c) 1996, 97, 98, 99, 2000 Kunihiro Ishiguro <kunihiro@zebra.org>
 ##  Portions Copyright (c) 2003 Paul Jakma <paul@dishone.st>
 ##
-## $Id: configure.ac,v 1.61 2004/08/27 15:57:35 gdt Exp $
+## $Id: configure.ac,v 1.62 2004/08/31 18:16:36 gdt Exp $
 AC_PREREQ(2.53)
 
 AC_INIT(quagga, 0.96.5, [http://bugzilla.quagga.net])
@@ -22,6 +22,17 @@
 dnl XXX add --exampledir to autoconf standard directory list somehow
 AC_SUBST(exampledir)
 
+dnl default is to match previous behavior
+pkgsrcrcdir=""
+pkgsrcdir=""
+AC_ARG_ENABLE([pkgsrcrcdir],
+	  AC_HELP_STRING([--enable-pkgsrcrcdir],
+			 [specify directory for rc.d scripts]),
+			 pkgsrcrcdir="$enableval"; pkgsrcdir="pkgsrc",)
+dnl XXX add --pkgsrcrcdir to autoconf standard directory list somehow
+AC_SUBST(pkgsrcdir)
+AC_SUBST(pkgsrcrcdir)
+
 dnl -----------------------------------
 dnl Get hostname and other information.
 dnl -----------------------------------
@@ -1127,6 +1138,8 @@
 	  redhat/Makefile redhat/quagga.spec
 	  lib/version.h
 	  tests/Makefile
+	  pkgsrc/bgpd.sh pkgsrc/ospf6d.sh pkgsrc/ospfd.sh
+	  pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh
 	  ,
 	  [chmod +x vtysh/extract.pl])
 
diff --git a/pkgsrc/ChangeLog b/pkgsrc/ChangeLog
new file mode 100644
index 0000000..79ade41
--- /dev/null
+++ b/pkgsrc/ChangeLog
@@ -0,0 +1,15 @@
+2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* Rename scripts to *.sh.in, and use autoconf-style substitution
+	  for prefix and localstatedir.
+	
+2004-08-31  Greg Troxel  <gdt@poblano.ir.bbn.com>
+
+	* Makefile.am: Only put pkgsrc dir in SUBDIRS if we should install
+	  rc.d files.  (Note that pkgsrc is always in DIST_SUBDIRS.)
+
+	* configure.ac (pkgsrcdir): add new --enable-pkgsrcrcdir to give a
+	  directory into which www.pkgsrc.org-style rc.d files are
+	  installed.
+
+
diff --git a/pkgsrc/Makefile.am b/pkgsrc/Makefile.am
index 4db92ab..622fbf0 100644
--- a/pkgsrc/Makefile.am
+++ b/pkgsrc/Makefile.am
@@ -1 +1,3 @@
-EXTRA_DIST = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh
+rcdir=@pkgsrcrcdir@
+
+rc_SCRIPTS = bgpd.sh ospf6d.sh ospfd.sh ripd.sh ripngd.sh zebra.sh
diff --git a/pkgsrc/bgpd.sh b/pkgsrc/bgpd.sh.in
similarity index 75%
rename from pkgsrc/bgpd.sh
rename to pkgsrc/bgpd.sh.in
index b150e9f..d234b54 100644
--- a/pkgsrc/bgpd.sh
+++ b/pkgsrc/bgpd.sh.in
@@ -6,7 +6,7 @@
 # REQUIRE: zebra
 ##
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
 export PATH
 
 if [ -f /etc/rc.subr ]
@@ -16,12 +16,12 @@
 
 name="bgpd"
 rcvar=$name
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-command="@PREFIX@/sbin/${name}"
+required_files="@sysconfdir@/${name}.conf"
+command="@prefix@/sbin/${name}"
 command_args="-d"
 
 start_precmd="zebra_precmd"
-socket_dir=/var/run/zebra
+socket_dir=@localstatedir@
 pidfile="${socket_dir}/${name}.pid"
 
 zebra_precmd()
diff --git a/pkgsrc/ospf6d.sh b/pkgsrc/ospf6d.sh.in
similarity index 75%
rename from pkgsrc/ospf6d.sh
rename to pkgsrc/ospf6d.sh.in
index b008823..3fbdb81 100644
--- a/pkgsrc/ospf6d.sh
+++ b/pkgsrc/ospf6d.sh.in
@@ -6,7 +6,7 @@
 # REQUIRE: zebra
 ##
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
 export PATH
 
 if [ -f /etc/rc.subr ]
@@ -16,12 +16,12 @@
 
 name="ospf6d"
 rcvar=$name
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-command="@PREFIX@/sbin/${name}"
+required_files="@sysconfdir@/${name}.conf"
+command="@prefix@/sbin/${name}"
 command_args="-d"
 
 start_precmd="zebra_precmd"
-socket_dir=/var/run/zebra
+socket_dir=@localstatedir@
 pidfile="${socket_dir}/${name}.pid"
 
 zebra_precmd()
diff --git a/pkgsrc/ospfd.sh b/pkgsrc/ospfd.sh.in
similarity index 75%
rename from pkgsrc/ospfd.sh
rename to pkgsrc/ospfd.sh.in
index c852211..daa2252 100644
--- a/pkgsrc/ospfd.sh
+++ b/pkgsrc/ospfd.sh.in
@@ -6,7 +6,7 @@
 # REQUIRE: zebra
 ##
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
 export PATH
 
 if [ -f /etc/rc.subr ]
@@ -16,12 +16,12 @@
 
 name="ospfd"
 rcvar=$name
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-command="@PREFIX@/sbin/${name}"
+required_files="@sysconfdir@/${name}.conf"
+command="@prefix@/sbin/${name}"
 command_args="-d"
 
 start_precmd="zebra_precmd"
-socket_dir=/var/run/zebra
+socket_dir=@localstatedir@
 pidfile="${socket_dir}/${name}.pid"
 
 zebra_precmd()
diff --git a/pkgsrc/ripd.sh b/pkgsrc/ripd.sh.in
similarity index 75%
rename from pkgsrc/ripd.sh
rename to pkgsrc/ripd.sh.in
index 6ba86c4..3157541 100644
--- a/pkgsrc/ripd.sh
+++ b/pkgsrc/ripd.sh.in
@@ -6,7 +6,7 @@
 # REQUIRE: zebra
 ##
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
 export PATH
 
 if [ -f /etc/rc.subr ]
@@ -16,12 +16,12 @@
 
 name="ripd"
 rcvar=$name
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-command="@PREFIX@/sbin/${name}"
+required_files="@sysconfdir@/${name}.conf"
+command="@prefix@/sbin/${name}"
 command_args="-d"
 
 start_precmd="zebra_precmd"
-socket_dir=/var/run/zebra
+socket_dir=@localstatedir@
 pidfile="${socket_dir}/${name}.pid"
 
 zebra_precmd()
diff --git a/pkgsrc/ripngd.sh b/pkgsrc/ripngd.sh.in
similarity index 75%
rename from pkgsrc/ripngd.sh
rename to pkgsrc/ripngd.sh.in
index ff45b4e..d06ac90 100644
--- a/pkgsrc/ripngd.sh
+++ b/pkgsrc/ripngd.sh.in
@@ -6,7 +6,7 @@
 # REQUIRE: zebra
 ##
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
 export PATH
 
 if [ -f /etc/rc.subr ]
@@ -16,12 +16,12 @@
 
 name="ripngd"
 rcvar=$name
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-command="@PREFIX@/sbin/${name}"
+required_files="@sysconfdir@/${name}.conf"
+command="@prefix@/sbin/${name}"
 command_args="-d"
 
 start_precmd="zebra_precmd"
-socket_dir=/var/run/zebra
+socket_dir=@localstatedir@
 pidfile="${socket_dir}/${name}.pid"
 
 zebra_precmd()
diff --git a/pkgsrc/zebra.sh b/pkgsrc/zebra.sh.in
similarity index 81%
rename from pkgsrc/zebra.sh
rename to pkgsrc/zebra.sh.in
index e4750f7..c2f12a7 100644
--- a/pkgsrc/zebra.sh
+++ b/pkgsrc/zebra.sh.in
@@ -6,7 +6,7 @@
 # REQUIRE: NETWORKING
 ##
 
-PATH=/sbin:/bin:/usr/sbin:/usr/bin:@PREFIX@/sbin:@PREFIX@/bin
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:@prefix@/sbin:@prefix@/bin
 export PATH
 
 if [ -f /etc/rc.subr ]
@@ -16,13 +16,13 @@
 
 name="zebra"
 rcvar=$name
-required_files="@PKG_SYSCONFDIR@/${name}.conf"
-command="@PREFIX@/sbin/${name}"
+required_files="@sysconfdir@/${name}.conf"
+command="@prefix@/sbin/${name}"
 command_args="-d"
 
 start_precmd="zebra_precmd"
 stop_postcmd="zebra_postcmd"
-socket_dir=/var/run/zebra
+socket_dir=@localstatedir@
 pidfile="${socket_dir}/${name}.pid"
 
 zebra_precmd()