diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 5ee2af5940c..2342e9618b6 100644
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -49,6 +49,7 @@ import com.cloud.domain.DomainVO;
 import com.cloud.exception.InternalErrorException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.hypervisor.Hypervisor;
+import com.cloud.hypervisor.Hypervisor.HypervisorType;
 import com.cloud.storage.SnapshotPolicyVO;
 import com.cloud.storage.dao.SnapshotPolicyDao;
 import com.cloud.user.User;
@@ -127,12 +128,11 @@ public class ConfigurationServerImpl implements ConfigurationServer {
 				
 				_configDao.update("secstorage.secure.copy.cert", "realhostip");
 				s_logger.debug("ConfigurationServer made secondary storage copy use realhostip.");					          	         
+			} else {
+				/*FOSS release, make external DHCP mode as default*/
+				_configDao.update("direct.attach.network.externalIpAllocator.enabled", "true");
 			}
 			
-			boolean externalIpAlloator = Boolean.parseBoolean(_configDao.getValue("direct.attach.network.externalIpAllocator.enabled"));
-			_configDao.update("direct.attach.network.externalIpAllocator.enabled", "true");
-
-			
 			// Save Direct Networking service offerings
 			_configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null);			
 			_configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null);