diff --git a/ChangeLog b/ChangeLog
index a5f193f..05e1f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-08  Greg Troxel  <gdt@fnord.ir.bbn.com>
+
+	* {lib,ospfd,ospfapi}/Makefile.am: Use pkginclude_HEADERS rather
+	than include_HEADERS to place includes in
+	${prefix}/include/quaggainstead of polluting ${prefix}/include.
+
 2003-12-04  Greg Troxel  <gdt@poblano.ir.bbn.com>
 
 	* configure.ac: When setting exampledir to sysconfdir as a
diff --git a/NEWS b/NEWS
index fa6d7d9..0a788cf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,13 @@
+* Changes in Quagga 0.96.5
+
+- include files are installed in $(prefix)/include/quagga.  Programs
+  building against these includes should -I$(prefix)/include and e.g.
+  #include <quagga/routemap.h>
+
+- New option --enable-exampledir puts example files in a separate
+  directory from $(sysconfdir), easing NetBSD pkgsrc hierarchy rules
+  compliance.
+
 * Changes in Quagga 0.96.4
 
 - Further fixes to ospfd, some relating to the PtP revert. Interface
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 27981e5..391c2b7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -16,7 +16,7 @@
 
 libzebra_a_LIBADD = @LIB_REGEX@
 
-include_HEADERS = \
+pkginclude_HEADERS = \
 	buffer.h command.h filter.h getopt.h hash.h if.h linklist.h log.h \
 	memory.h network.h prefix.h routemap.h distribute.h sockunion.h \
 	str.h stream.h table.h thread.h vector.h version.h vty.h zebra.h \
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
index fb041af..035ee90 100644
--- a/ospfclient/Makefile.am
+++ b/ospfclient/Makefile.am
@@ -8,7 +8,7 @@
 libospfapiclient_a_SOURCES = \
 	ospf_apiclient.c
 
-ospfapiheaderdir = $(includedir)/ospfapi
+ospfapiheaderdir = $(pkgincludedir)/ospfapi
 
 ospfapiheader_HEADERS = \
 	ospf_apiclient.h
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index f687ea9..7018b46 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -14,7 +14,7 @@
 	ospf_lsdb.c ospf_asbr.c ospf_routemap.c ospf_snmp.c \
 	ospf_opaque.c ospf_te.c ospf_vty.c ospf_api.c ospf_apiserver.c
 
-ospfdheaderdir = $(includedir)/ospfd
+ospfdheaderdir = $(pkgincludedir)/ospfd
 
 ospfdheader_HEADERS = \
 	ospf_api.h ospf_asbr.h ospf_dump.h ospf_lsa.h ospf_lsdb.h \