diff --git a/configure.in b/configure.in
index c790a4524..0ac20d6ae 100644
--- a/configure.in
+++ b/configure.in
@@ -36,6 +36,7 @@ ARG_WITH_SUBST([piddir],             [/var/run], [set path for PID and UNIX sock
 ARG_WITH_SUBST([ipsecdir],           [${libexecdir%/}/ipsec], [set installation path for ipsec tools])
 ARG_WITH_SUBST([ipseclibdir],        [${libdir%/}/ipsec], [set installation path for ipsec libraries])
 ARG_WITH_SUBST([plugindir],          [${ipseclibdir%/}/plugins], [set the installation path of plugins])
+ARG_WITH_SUBST([imcvdir],            [${ipseclibdir%/}/imcvs], [set the installation path of IMC and IMV dynamic librariers])
 ARG_WITH_SUBST([nm-ca-dir],          [/usr/share/ca-certificates], [directory the NM plugin uses to look up trusted root certificates])
 ARG_WITH_SUBST([linux-headers],      [\${top_srcdir}/src/include], [set directory of linux header files to use])
 ARG_WITH_SUBST([routing-table],      [220], [set routing table to use for IPsec routes])
diff --git a/src/libimcv/plugins/imc_scanner/Makefile.am b/src/libimcv/plugins/imc_scanner/Makefile.am
index caf2c868f..f27d73b67 100644
--- a/src/libimcv/plugins/imc_scanner/Makefile.am
+++ b/src/libimcv/plugins/imc_scanner/Makefile.am
@@ -4,13 +4,12 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
 
 AM_CFLAGS = -rdynamic
 
-plugin_LTLIBRARIES = libstrongswan-imc-scanner.la
+imcv_LTLIBRARIES = imc-scanner.la
 
-libstrongswan_imc_scanner_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
+imc_scanner_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
-libstrongswan_imc_scanner_la_SOURCES = imc_scanner.c \
-	imc_scanner_state.h imc_scanner_state.c
+imc_scanner_la_SOURCES = imc_scanner.c imc_scanner_state.h imc_scanner_state.c
 
-libstrongswan_imc_scanner_la_LDFLAGS = -module -avoid-version
+imc_scanner_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/libimcv/plugins/imc_test/Makefile.am b/src/libimcv/plugins/imc_test/Makefile.am
index 893d32a00..b55e7bcd4 100644
--- a/src/libimcv/plugins/imc_test/Makefile.am
+++ b/src/libimcv/plugins/imc_test/Makefile.am
@@ -4,13 +4,12 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
 
 AM_CFLAGS = -rdynamic
 
-plugin_LTLIBRARIES = libstrongswan-imc-test.la
+imcv_LTLIBRARIES = imc-test.la
 
-libstrongswan_imc_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
+imc_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
-libstrongswan_imc_test_la_SOURCES = imc_test.c \
-	imc_test_state.h imc_test_state.c
+imc_test_la_SOURCES = imc_test.c imc_test_state.h imc_test_state.c
 
-libstrongswan_imc_test_la_LDFLAGS = -module -avoid-version
+imc_test_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/libimcv/plugins/imv_scanner/Makefile.am b/src/libimcv/plugins/imv_scanner/Makefile.am
index 9d77a0c46..df2158e72 100644
--- a/src/libimcv/plugins/imv_scanner/Makefile.am
+++ b/src/libimcv/plugins/imv_scanner/Makefile.am
@@ -4,13 +4,12 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
 
 AM_CFLAGS = -rdynamic
 
-plugin_LTLIBRARIES = libstrongswan-imv-scanner.la
+imcv_LTLIBRARIES = imv-scanner.la
 
-libstrongswan_imv_scanner_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
+imv_scanner_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
-libstrongswan_imv_scanner_la_SOURCES = imv_scanner.c \
-	imv_scanner_state.h imv_scanner_state.c
+imv_scanner_la_SOURCES = imv_scanner.c imv_scanner_state.h imv_scanner_state.c
 
-libstrongswan_imv_scanner_la_LDFLAGS = -module -avoid-version
+imv_scanner_la_LDFLAGS = -module -avoid-version
 
diff --git a/src/libimcv/plugins/imv_test/Makefile.am b/src/libimcv/plugins/imv_test/Makefile.am
index a3a3c1d37..4ca5b852b 100644
--- a/src/libimcv/plugins/imv_test/Makefile.am
+++ b/src/libimcv/plugins/imv_test/Makefile.am
@@ -4,13 +4,12 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/libtncif \
 
 AM_CFLAGS = -rdynamic
 
-plugin_LTLIBRARIES = libstrongswan-imv-test.la
+imcv_LTLIBRARIES = imv-test.la
 
-libstrongswan_imv_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
+imv_test_la_LIBADD = $(top_builddir)/src/libimcv/libimcv.la \
 	$(top_builddir)/src/libstrongswan/libstrongswan.la
 
-libstrongswan_imv_test_la_SOURCES = imv_test.c \
-	imv_test_state.h imv_test_state.c
+imv_test_la_SOURCES = imv_test.c imv_test_state.h imv_test_state.c
 
-libstrongswan_imv_test_la_LDFLAGS = -module -avoid-version
+imv_test_la_LDFLAGS = -module -avoid-version