diff --git a/vmware_nsxlib/v3/__init__.py b/vmware_nsxlib/v3/__init__.py
index de65dd73..b47fad4e 100644
--- a/vmware_nsxlib/v3/__init__.py
+++ b/vmware_nsxlib/v3/__init__.py
@@ -151,7 +151,9 @@ class NsxLib(lib.NsxLibBase):
         if (version.LooseVersion(self.get_version()) >=
             version.LooseVersion(nsx_constants.NSX_VERSION_3_1_0)):
             # features available since 3.1.0
-            if (feature == nsx_constants.FEATURE_MP2P_MIGRATION):
+            if feature == nsx_constants.FEATURE_MP2P_MIGRATION:
+                return True
+            if feature == nsx_constants.FEATURE_SPOOFGUARD_CIDR:
                 return True
 
         if (version.LooseVersion(self.get_version()) >=
diff --git a/vmware_nsxlib/v3/nsx_constants.py b/vmware_nsxlib/v3/nsx_constants.py
index 83e0ca4a..4c5882b3 100644
--- a/vmware_nsxlib/v3/nsx_constants.py
+++ b/vmware_nsxlib/v3/nsx_constants.py
@@ -175,6 +175,7 @@ FEATURE_ROUTE_REDISTRIBUTION_CONFIG = 'Tier0 route redistribution config'
 FEATURE_CONTAINER_CLUSTER_INVENTORY = 'Container Cluster Inventory'
 FEATURE_IPV6 = 'IPV6 Forwarding and Address Allocation'
 FEATURE_MP2P_MIGRATION = 'MP to Policy Migration'
+FEATURE_SPOOFGUARD_CIDR = 'Spoofguard IPv4 CIDR'
 
 # Features available depending on the Policy Manager backend version
 FEATURE_NSX_POLICY = 'NSX Policy'
diff --git a/vmware_nsxlib/v3/policy/__init__.py b/vmware_nsxlib/v3/policy/__init__.py
index d4ab9544..809dceac 100644
--- a/vmware_nsxlib/v3/policy/__init__.py
+++ b/vmware_nsxlib/v3/policy/__init__.py
@@ -181,6 +181,12 @@ class NsxPolicyLib(lib.NsxLibBase):
             if feature == nsx_constants.FEATURE_NSX_POLICY_ADMIN_STATE:
                 return True
 
+        if (version.LooseVersion(self.get_version()) >=
+            version.LooseVersion(nsx_constants.NSX_VERSION_3_1_0)):
+            # features available since 3.1.0
+            if feature == nsx_constants.FEATURE_SPOOFGUARD_CIDR:
+                return True
+
         return (feature == nsx_constants.FEATURE_NSX_POLICY)
 
     def reinitialize_cluster(self, resource, event, trigger, payload=None):