diff --git a/redhat/quagga.spec.in b/redhat/quagga.spec.in
index fa50aaa..c4eeafe 100644
--- a/redhat/quagga.spec.in
+++ b/redhat/quagga.spec.in
@@ -21,6 +21,7 @@
 %{!?with_rtadv:			%global	with_rtadv		1 }
 %{!?with_isisd:			%global	with_isisd		1 }
 %{!?with_pimd:			%global	with_pimd		1 }
+%{!?with_nhrpd:			%global	with_nhrpd		1 }
 %{!?with_shared:		%global	with_shared		1 }
 %{!?with_multipath:		%global	with_multipath		64 }
 %{!?quagga_user:		%global	quagga_user		quagga }
@@ -87,13 +88,19 @@
 %define		daemon_pimd	""
 %endif
 
+%if %{with_nhrpd}
+%define         daemon_nhrpd	nhrpd
+%else
+%define		daemon_nhrpd	""
+%endif
+
 %if %{with_watchquagga}
 %define         daemon_watchquagga	watchquagga
 %else
 %define		daemon_watchquagga	""
 %endif
 
-%define		all_daemons	%{daemon_list} %{daemonv6_list} %{daemon_isisd} %{daemon_pimd} %{daemon_watchquagga}
+%define		all_daemons	%{daemon_list} %{daemonv6_list} %{daemon_isisd} %{daemon_pimd} %{daemon_nhrpd} %{daemon_watchquagga}
 
 # allow build dir to be kept
 %{!?keep_build:		%global		keep_build	0 }
@@ -144,7 +151,7 @@
 protocol. It takes multi-server and multi-thread approach to resolve
 the current complexity of the Internet.
 
-Quagga supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng and PIM.
+Quagga supports BGP4, OSPFv2, OSPFv3, ISIS, RIP, RIPng, PIM and NHRP.
 
 Quagga is intended to be used as a Route Server and a Route Reflector. It is
 not a toolkit, it provides full routing power under a new architecture.
@@ -229,6 +236,11 @@
 %else
 	--disable-isisd \
 %endif
+%if %{with_nhrpd}
+	--enable-nhrpd \
+%else
+	--disable-nhrpd \
+%endif
 %if %{with_pam}
 	--with-libpam \
 %endif
@@ -345,6 +357,9 @@
 %if %{with_pimd}
 zebra_spec_add_service pimd     2611/tcp "PIMd vty"
 %endif
+%if %{with_nhrpd}
+zebra_spec_add_service nhrpd    2612/tcp "NHRPd vty"
+%endif
 
 %if "%{initsystem}" == "systemd"
 for daemon in %all_daemons ; do
@@ -522,6 +537,9 @@
 %if %{with_isisd}
 %{_sbindir}/isisd
 %endif
+%if %{with_nhrpd}
+%{_sbindir}/nhrpd
+%endif
 %if %{with_shared}
 %attr(755,root,root) %{_libdir}/lib*.so
 %attr(755,root,root) %{_libdir}/lib*.so.*
@@ -548,6 +566,9 @@
 	%if %{with_pimd}
 		%config /etc/rc.d/init.d/pimd
 	%endif
+	%if %{with_nhrpd}
+		%config /etc/rc.d/init.d/nhrpd
+	%endif
 %endif
 %config(noreplace) /etc/sysconfig/quagga
 %config(noreplace) /etc/pam.d/quagga
@@ -574,7 +595,10 @@
 %endif
 
 %changelog
-* Thu Feb 11 2016 Paul Jakma <paul@jakma.org> - %{version}
+* Tue Feb 14 2017 Timo Teräs <timo.teras@iki.fi> - %{version}
+- add nhrpd
+
+* Thu Feb 11 2016 Paul Jakma <paul@jakma.org>
 - remove with_ipv6 conditionals, always build v6
 - Fix UTF-8 char in spec changelog
 - remove quagga.pam.stack, long deprecated.