diff --git a/ospfclient/ospf_apiclient.c b/ospfclient/ospf_apiclient.c
index 05c5e7789d..4982cd885e 100644
--- a/ospfclient/ospf_apiclient.c
+++ b/ospfclient/ospf_apiclient.c
@@ -54,10 +54,6 @@
 
 #include "ospf_apiclient.h"
 
-/* *sigh* ... can't find a better way to hammer this into automake */
-#include "ospfd/ospf_dump_api.c"
-#include "ospfd/ospf_api.c"
-
 XREF_SETUP();
 
 DEFINE_MGROUP(OSPFCLIENT, "libospfapiclient");
diff --git a/ospfclient/subdir.am b/ospfclient/subdir.am
index b8c82c0bcf..289ddd009d 100644
--- a/ospfclient/subdir.am
+++ b/ospfclient/subdir.am
@@ -27,6 +27,7 @@ endif
 
 ospfclient_ospfclient_LDADD = \
 	ospfclient/libfrrospfapiclient.la \
+	ospfd/libfrrospfclient.a \
 	$(LIBCAP) \
 	# end
 
diff --git a/ospfd/subdir.am b/ospfd/subdir.am
index b67f942883..e45f617dfa 100644
--- a/ospfd/subdir.am
+++ b/ospfd/subdir.am
@@ -4,6 +4,7 @@
 
 if OSPFD
 noinst_LIBRARIES += ospfd/libfrrospf.a
+noinst_LIBRARIES += ospfd/libfrrospfclient.a
 sbin_PROGRAMS += ospfd/ospfd
 vtysh_daemons += ospfd
 if SNMP
@@ -12,6 +13,11 @@ endif
 man8 += $(MANBUILD)/frr-ospfd.8
 endif
 
+ospfd_libfrrospfclient_a_SOURCES = \
+	ospfd/ospf_api.c \
+	ospfd/ospf_dump_api.c \
+	#end
+
 ospfd_libfrrospf_a_SOURCES = \
 	ospfd/ospf_abr.c \
 	ospfd/ospf_api.c \
@@ -104,7 +110,7 @@ noinst_HEADERS += \
 	ospfd/ospf_zebra.h \
 	# end
 
-ospfd_ospfd_LDADD = ospfd/libfrrospf.a lib/libfrr.la $(LIBCAP) $(LIBM)
+ospfd_ospfd_LDADD = ospfd/libfrrospf.a ospfd/libfrrospfclient.a lib/libfrr.la $(LIBCAP) $(LIBM)
 ospfd_ospfd_SOURCES = ospfd/ospf_main.c
 
 ospfd_ospfd_snmp_la_SOURCES = ospfd/ospf_snmp.c