diff --git a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
index e070cd8adf1..cc55cb23287 100644
--- a/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
+++ b/api/src/com/cloud/agent/api/routing/DhcpEntryCommand.java
@@ -24,6 +24,9 @@ public class DhcpEntryCommand extends NetworkElementCommand {
     String vmMac;
     String vmIpAddress;
     String vmName;
+    String dns;
+    String gateway;
+    String nextServer;
     
     protected DhcpEntryCommand() {
     	
@@ -40,6 +43,20 @@ public class DhcpEntryCommand extends NetworkElementCommand {
         this.vmName = vmName;
     }
     
+    public DhcpEntryCommand(String vmMac, String vmIpAddress, String vmName, String dns, String gateway) {
+    	this(vmMac, vmIpAddress, vmName);
+    	this.dns = dns;
+    	this.gateway = gateway;
+    }
+    
+    public String getDns() {
+    	return dns;
+    }
+    
+    public String getGateway() {
+    	return gateway;
+    }
+    
 	public String getVmMac() {
 		return vmMac;
 	}
@@ -52,4 +69,12 @@ public class DhcpEntryCommand extends NetworkElementCommand {
 		return vmName;
 	}
 	
+	public void setNextServer(String ip) {
+		nextServer = ip;
+	}
+	
+	public String getNextServer() {
+		return nextServer;
+	}
+	
 }
diff --git a/scripts/network/exdhcp/dhcpd_edithosts.py b/scripts/network/exdhcp/dhcpd_edithosts.py
new file mode 100644
index 00000000000..c46f5975a72
--- /dev/null
+++ b/scripts/network/exdhcp/dhcpd_edithosts.py
@@ -0,0 +1,100 @@
+#!/usr/bin/python
+
+# Usage: dhcpd_edithosts.py mac ip hostname dns gateway nextserver
+import sys, os
+from os.path import exists
+from time import sleep
+from os import remove
+
+usage = '''dhcpd_edithosts.py mac ip hostname dns gateway nextserver'''
+conf_path = "/etc/dhcpd.conf"
+file_lock = "/etc/dhcpd.conf_locked"
+sleep_max = 20
+host_entry = 'host %s { hardware ethernet %s; fixed-address %s; option domain-name-servers %s; option domain-name "%s"; option routers %s; default-lease-time infinite; max-lease-time infinite; min-lease-time infinite;}'
+host_entry1 = 'host %s { hardware ethernet %s; fixed-address %s; option domain-name-servers %s; option domain-name "%s"; option routers %s; default-lease-time infinite; max-lease-time infinite; min-lease-time infinite; next-server %s;}'
+def lock():
+	if exists(file_lock):
+		count = 0
+		while(exists(file_lock)):
+			sleep(1)
+			count = count + 1
+			if count > sleep_max:
+				print "Can not get file lock at %s, time expired" % file_lock
+				return False
+	
+	try:
+		f = open(file_lock, "w")
+		f.close()
+		return True
+	except IOError,e:
+		print "Cannot create file lock at /etc/dhcpd.conf_locked,", e
+		return False
+
+
+def unlock():
+	if exists(file_lock) == False:
+		print "Cannot find %s when unlocking, race condition happens" % file_lock
+	else:
+		try:
+			remove(file_lock)
+			return True
+		except IOError, e:
+			print "Cannot remove file lock at %s" % file_lock
+			return False
+
+def insert_host_entry(mac, ip, hostname, dns, gateway, next_server):
+	if lock() == False:
+		return 1
+
+	cmd = 'sed -i /"fixed-address %s"/d %s' % (ip, conf_path)
+	ret = os.system(cmd)
+	if ret != 0:
+		print "Command %s failed" % cmd
+		unlock()
+		return 1
+
+	cmd = 'sed -i /"hardware ethernet %s"/d %s' % (mac, conf_path)
+	ret = os.system(cmd)
+	if ret != 0:
+		print "Command %s failed" % cmd
+		unlock()
+		return 1
+
+	if next_server != "null":
+		entry = host_entry1 % (hostname, mac, ip, dns, "cloudnine.internal", gateway, next_server)
+	else:
+		entry = host_entry % (hostname, mac, ip, dns, "cloudnine.internal", gateway)
+	cmd = '''echo '%s' >> %s''' % (entry, conf_path)
+	ret = os.system(cmd)
+	if ret != 0:
+		print "Command %s failed" % cmd
+		unlock()
+		return 1
+
+	cmd = 'service dhcpd restart'
+	ret = os.system(cmd)
+	if ret != 0:
+		print "Command %s failed" % cmd
+		unlock()
+		return 1
+
+	if unlock() == False:
+		return 1
+
+	return 0
+
+if __name__ == "__main__":
+	if len(sys.argv) < 7:
+		print usage
+		sys.exit(1)
+	
+	mac = sys.argv[1]
+	ip = sys.argv[2]
+	hostname = sys.argv[3]
+	dns = sys.argv[4]
+	gateway = sys.argv[5]
+	next_server = sys.argv[6]
+
+	ret = insert_host_entry(mac, ip, hostname, dns, gateway, next_server)
+	sys.exit(ret)
+