diff --git a/agent/conf/agent.properties b/agent/conf/agent.properties
index 27572b53653..74cfd1c21d6 100644
--- a/agent/conf/agent.properties
+++ b/agent/conf/agent.properties
@@ -69,3 +69,14 @@ domr.scripts.dir=scripts/network/domr/kvm
 # set the vm migrate speed, by default, it will try to guess the speed of the guest network
 # In MegaBytes per second
 #vm.migrate.speed=0
+
+# set the type of bridge used on the hypervisor, this defines what commands the resource 
+# will use to setup networking. Currently supported NATIVE, OPENVSWITCH
+#network.bridge.type=native
+
+# set the driver used to plug and unplug nics from the bridges
+# a sensible default will be selected based on the network.bridge.type but can
+# be overridden here.
+# native = com.cloud.hypervisor.kvm.resource.BridgeVifDriver
+# openvswitch = com.cloud.hypervisor.kvm.resource.OvsBridgeDriver
+#libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.BridgeVifDriver
\ No newline at end of file
diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index fade750c5f8..1474d114619 100755
--- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -786,8 +786,14 @@ public class LibvirtComputingResource extends ServerResourceBase implements
         // Load the vif driver
         String vifDriverName = (String) params.get("libvirt.vif.driver");
         if (vifDriverName == null) {
-        	s_logger.info("No libvirt.vif.driver specififed. Defaults to BridgeVifDriver.");
-        	vifDriverName = "com.cloud.hypervisor.kvm.resource.BridgeVifDriver";
+        	if (_bridgeType == BridgeType.OPENVSWITCH) {
+        		s_logger.info("No libvirt.vif.driver specififed. Defaults to OvsVifDriver.");
+        		vifDriverName = "com.cloud.hypervisor.kvm.resource.OvsVifDriver";
+        	}
+        	else {
+        		s_logger.info("No libvirt.vif.driver specififed. Defaults to BridgeVifDriver.");
+        		vifDriverName = "com.cloud.hypervisor.kvm.resource.BridgeVifDriver";
+        	}
         }
 
         params.put("libvirt.computing.resource", (Object) this);