diff --git a/Makefile.am b/Makefile.am
index a0c0d0ab09..bd421c9dde 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,16 +35,17 @@ include ospfd/subdir.am
 include ospf6d/subdir.am
 include ospfclient/subdir.am
 include isisd/subdir.am
+include nhrpd/subdir.am
 
 SUBDIRS = . @LIBRFP@ @RFPTEST@ \
 	 @BGPD@ @LDPD@ \
-         @PIMD@ @NHRPD@ @EIGRPD@ @BABELD@ \
+         @PIMD@ @EIGRPD@ @BABELD@ \
 	 @WATCHFRR@ @VTYSH@ @DOC@ \
          @SOLARIS@ tests tools
 
 DIST_SUBDIRS = . bgpd ldpd \
 	  watchfrr vtysh doc tests \
-	  solaris pimd nhrpd eigrpd bgpd/rfp-example/librfp \
+	  solaris pimd eigrpd bgpd/rfp-example/librfp \
 	  bgpd/rfp-example/rfptest tools babeld \
 	  # end
 
diff --git a/configure.ac b/configure.ac
index a1d4f67511..81ab9dc682 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1352,7 +1352,6 @@ AC_SUBST(RFPINC)
 AC_SUBST(BABELD)
 AC_SUBST(BGPD)
 AC_SUBST(LDPD)
-AC_SUBST(NHRPD)
 AC_SUBST(EIGRPD)
 AC_SUBST(WATCHFRR)
 AC_SUBST(ISISD)
@@ -1811,7 +1810,6 @@ AC_CONFIG_FILES([Makefile
 	  babeld/Makefile
 	  pimd/Makefile
 	  eigrpd/Makefile
-	  nhrpd/Makefile
 	  tools/Makefile
 	  redhat/frr.spec
 	  snapcraft/snapcraft.yaml
diff --git a/nhrpd/.gitignore b/nhrpd/.gitignore
index 3d4d56d589..3f47381278 100644
--- a/nhrpd/.gitignore
+++ b/nhrpd/.gitignore
@@ -1 +1,2 @@
+!Makefile
 nhrpd
diff --git a/nhrpd/Makefile b/nhrpd/Makefile
new file mode 100644
index 0000000000..62c9546020
--- /dev/null
+++ b/nhrpd/Makefile
@@ -0,0 +1,10 @@
+all: ALWAYS
+	@$(MAKE) -s -C .. nhrpd/nhrpd
+%: ALWAYS
+	@$(MAKE) -s -C .. nhrpd/$@
+
+Makefile:
+	#nothing
+ALWAYS:
+.PHONY: ALWAYS makefiles
+.SUFFIXES:
diff --git a/nhrpd/Makefile.am b/nhrpd/Makefile.am
deleted file mode 100644
index 64d9e09bfb..0000000000
--- a/nhrpd/Makefile.am
+++ /dev/null
@@ -1,47 +0,0 @@
-## Process this file with automake to produce Makefile.in.
-
-AM_CPPFLAGS = -I.. -I$(top_srcdir) -I$(top_srcdir)/lib -I$(top_builddir)/lib -DQUAGGA_NO_DEPRECATED_INTERFACES
-DEFS = @DEFS@ @CARES_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
-INSTALL_SDATA=@INSTALL@ -m 600
-
-AM_CFLAGS = $(PICFLAGS) $(WERROR)
-AM_LDFLAGS = $(PICLDFLAGS)
-
-sbin_PROGRAMS = nhrpd
-
-nhrpd_SOURCES = \
-	zbuf.c \
-	znl.c \
-	resolver.c \
-	linux.c \
-	netlink_arp.c \
-	netlink_gre.c \
-	vici.c \
-	reqid.c \
-	nhrp_event.c \
-	nhrp_packet.c \
-	nhrp_interface.c \
-	nhrp_vc.c \
-	nhrp_peer.c \
-	nhrp_cache.c \
-	nhrp_nhs.c \
-	nhrp_route.c \
-	nhrp_shortcut.c \
-	nhrp_vty.c \
-	nhrp_main.c
-
-nhrpd_LDADD = ../lib/libfrr.la @LIBCAP@ @CARES_LIBS@
-
-noinst_HEADERS = \
-	debug.h \
-	list.h \
-	netlink.h \
-	nhrp_protocol.h \
-	nhrpd.h \
-	os.h \
-	vici.h \
-	zbuf.h \
-	znl.h \
-	# end
-
-#dist_examples_DATA = nhrpd.conf.sample
diff --git a/nhrpd/subdir.am b/nhrpd/subdir.am
new file mode 100644
index 0000000000..5b06946c89
--- /dev/null
+++ b/nhrpd/subdir.am
@@ -0,0 +1,43 @@
+#
+# nhrpd
+#
+
+if NHRPD
+sbin_PROGRAMS += nhrpd/nhrpd
+endif
+
+nhrpd_nhrpd_LDADD = lib/libfrr.la @LIBCAP@ @CARES_LIBS@
+nhrpd_nhrpd_CFLAGS = $(AM_CFLAGS) @CARES_CFLAGS@
+nhrpd_nhrpd_SOURCES = \
+	nhrpd/linux.c \
+	nhrpd/netlink_arp.c \
+	nhrpd/netlink_gre.c \
+	nhrpd/nhrp_cache.c \
+	nhrpd/nhrp_event.c \
+	nhrpd/nhrp_interface.c \
+	nhrpd/nhrp_main.c \
+	nhrpd/nhrp_nhs.c \
+	nhrpd/nhrp_packet.c \
+	nhrpd/nhrp_peer.c \
+	nhrpd/nhrp_route.c \
+	nhrpd/nhrp_shortcut.c \
+	nhrpd/nhrp_vc.c \
+	nhrpd/nhrp_vty.c \
+	nhrpd/reqid.c \
+	nhrpd/resolver.c \
+	nhrpd/vici.c \
+	nhrpd/zbuf.c \
+	nhrpd/znl.c \
+	# end
+
+noinst_HEADERS += \
+	nhrpd/debug.h \
+	nhrpd/list.h \
+	nhrpd/netlink.h \
+	nhrpd/nhrp_protocol.h \
+	nhrpd/nhrpd.h \
+	nhrpd/os.h \
+	nhrpd/vici.h \
+	nhrpd/zbuf.h \
+	nhrpd/znl.h \
+	# end