diff --git a/debian/cloudstack-agent.install b/debian/cloudstack-agent.install
index cf57bfe39b4..b1425717584 100644
--- a/debian/cloudstack-agent.install
+++ b/debian/cloudstack-agent.install
@@ -23,3 +23,4 @@
 /usr/bin/cloud-ssh
 /var/log/cloudstack/agent
 /usr/share/cloudstack-agent/lib/*
+/usr/share/cloudstack-agent/plugins
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index cf950d1bd04..612a1541a15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,10 +56,13 @@ install:
 	mkdir -p debian/tmp/var/log/$(PACKAGE)
 	mkdir -p debian/tmp/var/lib/$(PACKAGE)
 	mkdir -p debian/tmp/usr/bin
+	mkdir -p debian/tmp/usr/share
 
 	# cloudstack-agent
 	mkdir debian/tmp$(SYSCONFDIR)/$(PACKAGE)/agent
 	mkdir debian/tmp/var/log/$(PACKAGE)/agent
+	mkdir debian/tmp/usr/share/$(PACKAGE)-agent
+	mkdir debian/tmp/usr/share/$(PACKAGE)-agent/plugins
 	install -D agent/target/cloud-agent-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-agent/lib/$(PACKAGE)-agent.jar
 	install -D plugins/hypervisors/kvm/target/cloud-plugin-hypervisor-kvm-4.2.0-SNAPSHOT.jar debian/tmp/usr/share/$(PACKAGE)-agent/lib/
 	install -D plugins/hypervisors/kvm/target/dependencies/* debian/tmp/usr/share/$(PACKAGE)-agent/lib/
diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc
index 58611f299ba..6d534732528 100755
--- a/packaging/centos63/cloud-agent.rc
+++ b/packaging/centos63/cloud-agent.rc
@@ -57,11 +57,12 @@ done
 export JAVA_HOME
 
 ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
+PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | sed s'/.$//'`
 
 # We need to append the JSVC daemon JAR to the classpath
 # AgentShell implements the JSVC daemon methods
 # We also need JNA in the classpath (from the distribution) for the Libvirt Java bindings
-export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$ACP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
+export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$ACP:$PCP:/etc/cloudstack/agent:/usr/share/cloudstack-common/scripts"
 
 start() {
     echo -n $"Starting $PROGNAME: "
diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec
index 369ff7f11de..a4db5017ee5 100644
--- a/packaging/centos63/cloud.spec
+++ b/packaging/centos63/cloud.spec
@@ -256,6 +256,7 @@ chmod 770 ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
 mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent
 mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/agent
 mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/lib
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-agent/plugins
 install -D packaging/centos63/cloud-agent.rc ${RPM_BUILD_ROOT}%{_sysconfdir}/init.d/%{name}-agent
 install -D agent/target/transformed/agent.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/agent.properties
 install -D agent/target/transformed/environment.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/agent/environment.properties
@@ -395,6 +396,7 @@ fi
 %config(noreplace) %{_sysconfdir}/%{name}/agent
 %dir %{_localstatedir}/log/%{name}/agent
 %attr(0644,root,root) %{_datadir}/%{name}-agent/lib/*.jar
+%dir %{_datadir}/%{name}-agent/plugins
 %doc LICENSE
 %doc NOTICE
 
diff --git a/packaging/debian/init/cloud-agent b/packaging/debian/init/cloud-agent
index 502bef4cbfc..c87a5c09f81 100755
--- a/packaging/debian/init/cloud-agent
+++ b/packaging/debian/init/cloud-agent
@@ -56,11 +56,12 @@ done
 export JAVA_HOME
 
 ACP=`ls /usr/share/cloudstack-agent/lib/*.jar | tr '\n' ':' | sed s'/.$//'`
+PCP=`ls /usr/share/cloudstack-agent/plugins/*.jar 2>/dev/null | tr '\n' ':' | sed s'/.$//'`
 
 # We need to append the JSVC daemon JAR to the classpath
 # AgentShell implements the JSVC daemon methods
 # We also need JNA in the classpath (from the distribution) for the Libvirt Java bindings
-export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$ACP:/etc/cloudstack/agent"
+export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$ACP:$PCP:/etc/cloudstack/agent"
 
 wait_for_network() {
     i=1