diff --git a/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf b/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf
deleted file mode 100644
index 4648356809b..00000000000
--- a/agent/distro/ubuntu/SYSCONFDIR/init/cloud-agent.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-description "CloudStack Computing Node Daemon"
-author "Edison Su<edison@cloud.com>"
-
-start on (net-device-up IFACE=cloudbr0)
-stop on runlevel [!2345]
-
-
-expect fork
-exec /usr/bin/cloud-daemonize -n "cloud-agent" -p "/var/run/cloud-agent.pid"  -l "/var/log/cloud/agent/agent.log" /usr/bin/agent-runner
-
diff --git a/debian/cloud-agent.install b/debian/cloud-agent.install
index e2201dfcd7a..5a053116690 100644
--- a/debian/cloud-agent.install
+++ b/debian/cloud-agent.install
@@ -2,7 +2,7 @@
 /etc/cloud/agent/developer.properties.template
 /etc/cloud/agent/environment.properties
 /etc/cloud/agent/log4j-cloud.xml
-/etc/init/cloud-agent.conf
+/etc/init.d/cloud-agent
 /usr/bin/agent-runner
 /usr/bin/cloud-setup-agent
 /usr/lib/cloud/agent/css
diff --git a/debian/cloud-agent.postinst b/debian/cloud-agent.postinst
index 8b2e1cd640a..934ee02efed 100644
--- a/debian/cloud-agent.postinst
+++ b/debian/cloud-agent.postinst
@@ -8,7 +8,11 @@ case "$1" in
 		chmod 0770 $i
 	done
 	
+	if [ "$2" = "" ] ; then # no recently configured version, this is a first install
+		/usr/sbin/update-rc.d cloud-agent defaults || true
+	fi
+	
     ;;
 esac
 
-#DEBHELPER#
+#DEBHELPER#
\ No newline at end of file