diff --git a/drivers/src/main/java/org/onosproject/driver/handshaker/DefaultSwitchHandShaker.java b/drivers/src/main/java/org/onosproject/driver/handshaker/DefaultSwitchHandShaker.java
index 21c59e6..671acda 100644
--- a/drivers/src/main/java/org/onosproject/driver/handshaker/DefaultSwitchHandShaker.java
+++ b/drivers/src/main/java/org/onosproject/driver/handshaker/DefaultSwitchHandShaker.java
@@ -34,9 +34,6 @@
 
     @Override
     public Boolean supportNxRole() {
-        if (this.factory().getVersion() == OFVersion.OF_10) {
-            return true;
-        }
         return false;
     }
 
diff --git a/drivers/src/main/java/org/onosproject/driver/handshaker/NiciraSwitchHandShaker.java b/drivers/src/main/java/org/onosproject/driver/handshaker/NiciraSwitchHandShaker.java
new file mode 100644
index 0000000..467cc9b
--- /dev/null
+++ b/drivers/src/main/java/org/onosproject/driver/handshaker/NiciraSwitchHandShaker.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2015 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.driver.handshaker;
+
+import org.projectfloodlight.openflow.protocol.OFVersion;
+
+/**
+ * Default driver to fallback on if no other driver is available.
+ */
+public class NiciraSwitchHandShaker extends DefaultSwitchHandShaker {
+
+    @Override
+    public Boolean supportNxRole() {
+        if (this.factory().getVersion() == OFVersion.OF_10) {
+            return true;
+        }
+        return false;
+    }
+
+}
diff --git a/drivers/src/main/resources/onos-drivers.xml b/drivers/src/main/resources/onos-drivers.xml
index a1ce5302..aaa1cbd 100644
--- a/drivers/src/main/resources/onos-drivers.xml
+++ b/drivers/src/main/resources/onos-drivers.xml
@@ -21,7 +21,11 @@
         <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
                    impl="org.onosproject.driver.handshaker.DefaultSwitchHandShaker"/>
     </driver>
-    <driver name="ovs-corsa" extends="default"
+    <driver name="ovs" extends="default" manufacturer="Nicira, Inc\." hwVersion="Open vSwitch" swVersion="2\..*">
+        <behaviour api="org.onosproject.openflow.controller.driver.OpenFlowSwitchDriver"
+                   impl="org.onosproject.driver.handshaker.NiciraSwitchHandShaker"/>
+    </driver>
+    <driver name="ovs-corsa" extends="ovs"
             manufacturer="Corsa" hwVersion="emulation" swVersion="0.0.0">
         <behaviour api="org.onosproject.net.behaviour.Pipeliner"
                    impl="org.onosproject.driver.pipeline.OVSCorsaPipeline"/>