diff --git a/Makefile.am b/Makefile.am
index 8a220c5..95faaf1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,8 +19,7 @@
 ipmiwhitelist.cpp: ${srcdir}/generate_whitelist.sh $(WHITELIST_CONF)
 	$(SHELL) $^ > $@
 
-
-libapphandlerdir = ${libdir}/host-ipmid
+libapphandlerdir = ${libdir}/ipmid-providers
 libapphandler_LTLIBRARIES = libapphandler.la
 libapphandler_la_SOURCES = \
 	apphandler.cpp \
@@ -36,13 +35,14 @@
 libapphandler_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) -version-info 0:0:0 -shared
 libapphandler_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS)
 
-libsysintfcmdsdir = ${libdir}/host-ipmid
+libsysintfcmdsdir = ${libdir}/ipmid-providers
 libsysintfcmds_LTLIBRARIES = libsysintfcmds.la
 libsysintfcmds_la_SOURCES = \
 	systemintfcmds.cpp
-libsysintfcmds_la_LDFLAGS = -version-info 0:0:0 -shared
+libsysintfcmds_la_LDFLAGS = $(SYSTEMD_LIBS) $(libmapper_LIBS) -version-info 0:0:0 -shared
+libsysintfcmds_la_CXXFLAGS = $(SYSTEMD_CFLAGS) $(libmapper_CFLAGS)
 
-libhostservicedir = ${libdir}/host-ipmid
+libhostservicedir = ${libdir}/ipmid-providers
 libhostservice_LTLIBRARIES = libhostservice.la
 libhostservice_la_SOURCES = \
 	host-services.c
@@ -52,4 +52,4 @@
 nobase_include_HEADERS = \
 	host-ipmid/ipmid-api.h
 
-SUBDIRS = test
+SUBDIRS = test
\ No newline at end of file