diff --git a/Makefile.am b/Makefile.am
index d18837c083..0092ba8c10 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,9 +8,8 @@ SUBDIRS = lib qpb fpm @ZEBRA@ @LIBRFP@ @RFPTEST@ \
 
 DIST_SUBDIRS = lib qpb fpm zebra bgpd ripd ripngd ospfd ospf6d ldpd \
 	  isisd watchfrr vtysh ospfclient doc m4 pkgsrc redhat tests \
-	  solaris pimd nhrpd eigrpd @LIBRFP@ @RFPTEST@ tools snapcraft \
-	  babeld \
-	  python \
+	  solaris pimd nhrpd eigrpd bgpd/rfp-example/librfp \
+	  bgpd/rfp-example/rfptest tools snapcraft babeld python \
 	  # end
 
 EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \
diff --git a/configure.ac b/configure.ac
index 03951503c1..4cfa829f2a 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1969,10 +1969,11 @@ AC_CACHE_VAL(ac_cv_htonl_works,
 )
 AC_MSG_RESULT($ac_cv_htonl_works)
 
-AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile 
+AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/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
+	  bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile
 	  babeld/Makefile
 	  pimd/Makefile
 	  eigrpd/Makefile
@@ -1982,7 +1983,7 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
 	  pkgsrc/Makefile
 	  python/Makefile
 	  fpm/Makefile
-	  redhat/frr.spec 
+	  redhat/frr.spec
 	  snapcraft/Makefile
 	  snapcraft/snapcraft.yaml
 	  lib/version.h
@@ -2007,13 +2008,6 @@ AC_CONFIG_FILES([Makefile lib/Makefile qpb/Makefile zebra/Makefile ripd/Makefile
 	  pkgsrc/ripd.sh pkgsrc/ripngd.sh pkgsrc/zebra.sh
 	  pkgsrc/eigrpd.sh])
 
-if test "${enable_bgp_vnc}" != "no"; then
-   if test "${with_rfp_path}" = "bgpd/rfp-example" ; then 
-     AC_CONFIG_FILES([bgpd/rfp-example/rfptest/Makefile bgpd/rfp-example/librfp/Makefile])
-   else
-     AC_CONFIG_FILES([${with_rfp_path}/rfptest/Makefile ${with_rfp_path}/librfp/Makefile])
-   fi
-fi
 
 AC_CONFIG_FILES([solaris/Makefile])
 
diff --git a/doc/ospfclient.8.in b/doc/ospfclient.8.in
index fb996a541f..a304beffda 100644
--- a/doc/ospfclient.8.in
+++ b/doc/ospfclient.8.in
@@ -1,5 +1,5 @@
 .\" This file was originally generated by help2man 1.36.
-.TH OSPFCLIENT "1" "July 2010"
+.TH OSPFCLIENT "8" "July 2010"
 .SH NAME
 ospfclient \- an example ospf-api client
 .SH SYNOPSIS
diff --git a/tools/Makefile.am b/tools/Makefile.am
index dd32d0dab0..e5a118972b 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -11,6 +11,6 @@ permutations_LDADD = ../lib/libfrr.la
 
 sbin_SCRIPTS = frr-reload.py frr
 
-EXTRA_DIST += frr.service frr-reload.py frr
+EXTRA_DIST += frr.service frr-reload.py frr etc
 
 ssd_SOURCES = start-stop-daemon.c