diff --git a/agent/libexec/agent-runner.in b/agent/libexec/agent-runner.in
index 3a975e96fbe..f7b402b8cda 100755
--- a/agent/libexec/agent-runner.in
+++ b/agent/libexec/agent-runner.in
@@ -7,7 +7,7 @@ SYSTEMJARS="@SYSTEMJARS@"
 SCP=$(build-classpath $SYSTEMJARS) ; if [ $? != 0 ] ; then SCP="@SYSTEMCLASSPATH@" ; fi
 DCP="@DEPSCLASSPATH@"
 ACP="@AGENTCLASSPATH@"
-export CLASSPATH=$SCP:$DCP:$ACP:@AGENTSYSCONFDIR@
+export CLASSPATH=/usr/share/java/'*':$SCP:$DCP:$ACP:@AGENTSYSCONFDIR@
 for jarfile in "@PREMIUMJAVADIR@"/* ; do
 	if [ ! -e "$jarfile" ] ; then continue ; fi
 	CLASSPATH=$jarfile:$CLASSPATH
diff --git a/debian/cloud-agent-scripts.install b/debian/cloud-agent-scripts.install
index 6785974a7b6..69f36ae50f1 100644
--- a/debian/cloud-agent-scripts.install
+++ b/debian/cloud-agent-scripts.install
@@ -8,5 +8,3 @@
 /usr/lib/cloud/agent/scripts/vm/hypervisor/kvm/*
 /usr/lib/cloud/agent/scripts/vm/hypervisor/versions.sh
 /usr/lib/cloud/agent/scripts/vm/hypervisor/xenserver/*
-/usr/lib/cloud/agent/vms/systemvm.zip
-/usr/lib/cloud/agent/vms/systemvm.iso
diff --git a/debian/cloud-system-iso.install b/debian/cloud-system-iso.install
new file mode 100644
index 00000000000..8f9192c8ede
--- /dev/null
+++ b/debian/cloud-system-iso.install
@@ -0,0 +1 @@
+/usr/lib/cloud/agent/vms/systemvm.iso
diff --git a/debian/control b/debian/control
index b69f4b7c95f..a5394c7c8cf 100644
--- a/debian/control
+++ b/debian/control
@@ -167,6 +167,12 @@ Description: Cloud.com agent premium
  a Cloud.com Cloud Stack-powered cloud.  Install this package if this computer
  will participate in your cloud.
 
+Package: cloud-system-iso
+Architecture: any
+Description: Cloud.com system iso
+ The Cloud.com agent is in charge of managing shared computing resources in
+ a Cloud.com Cloud Stack-powered cloud.  Install this package if this computer
+ will participate in your cloud.
 
 Package: cloud-console-proxy
 Architecture: any