diff --git a/lib/Makefile.am b/lib/Makefile.am
index 81f1e41..0268060 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -3,7 +3,7 @@
 INCLUDES = @INCLUDES@ -I.. -I$(top_srcdir) -I$(top_srcdir)/lib
 DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
 
-noinst_LIBRARIES = libzebra.a
+lib_LIBRARIES = libzebra.a
 
 libzebra_a_SOURCES = \
 	version.c network.c pid_output.c getopt.c getopt1.c daemon.c \
diff --git a/ospfclient/Makefile.am b/ospfclient/Makefile.am
index c345d1b..95a74ee 100644
--- a/ospfclient/Makefile.am
+++ b/ospfclient/Makefile.am
@@ -2,13 +2,15 @@
 
 INCLUDES = -I../lib -I../
 
-noinst_LIBRARIES = libospfapiclient.a
+lib_LIBRARIES = libospfapiclient.a
 sbin_PROGRAMS = ospfclient
 
 libospfapiclient_a_SOURCES = \
 	ospf_apiclient.c
 
-noinst_HEADERS = \
+ospfapiheaderdir = $(includedir)/ospfapi
+
+ospfapiheader_HEADERS = \
 	ospf_apiclient.h
 
 ospfclient_SOURCES = \
diff --git a/ospfd/Makefile.am b/ospfd/Makefile.am
index 990b0f1..2c4e4a1 100644
--- a/ospfd/Makefile.am
+++ b/ospfd/Makefile.am
@@ -5,7 +5,7 @@
 DEFS = @DEFS@ $(LOCAL_OPTS) -DSYSCONFDIR=\"$(sysconfdir)/\"
 INSTALL_SDATA=@INSTALL@ -m 600
 
-noinst_LIBRARIES = libospf.a
+lib_LIBRARIES = libospf.a
 sbin_PROGRAMS = ospfd
 
 libospf_a_SOURCES = \
@@ -15,12 +15,16 @@
 	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
+
+ospfdheader_HEADERS = \
+	ospf_api.h ospf_asbr.h ospf_dump.h ospf_lsa.h ospf_lsdb.h \
+	ospf_nsm.h ospf_ism.h ospf_opaque.h ospfd.h
+
 noinst_HEADERS = \
-	ospf_dump.h ospf_interface.h ospf_ism.h ospf_neighbor.h \
-	ospf_network.h ospf_nsm.h ospf_packet.h ospf_zebra.h ospfd.h \
-	ospf_lsa.h ospf_spf.h ospf_route.h ospf_ase.h ospf_abr.h ospf_ia.h \
-	ospf_flood.h ospf_lsdb.h ospf_asbr.h ospf_snmp.h ospf_opaque.h \
-	ospf_te.h ospf_vty.h ospf_api.h ospf_apiserver.h
+	ospf_interface.h ospf_neighbor.h ospf_network.h ospf_packet.h \
+	ospf_zebra.h ospf_spf.h ospf_route.h ospf_ase.h ospf_abr.h ospf_ia.h \
+	ospf_flood.h ospf_snmp.h ospf_te.h ospf_vty.h ospf_apiserver.h
 
 ospfd_SOURCES = \
 	ospf_main.c $(libospf_a_SOURCES)