diff --git a/README.rst b/README.rst
index 6fb4886..20b043f 100644
--- a/README.rst
+++ b/README.rst
@@ -658,6 +658,24 @@
           address: 172.16.0.50
       ...
 
+Override RPF default in Contrail API
+------------------------------------
+
+From MCP1.1 with OpenContrail >= 3.1.1 you can override RPF default for newly
+created virtual networks. This can be useful for usecases like running
+Calico and K8S in overlay. The `override_rpf_default_by` has valid values
+`disable`, `enable`. If not defined, the configuration fallbacks to Contrail
+default - currently `enable`.
+
+.. code-block:: yaml
+
+    opencontrail:
+      ...
+      config:
+        override_rpf_default_by: 'disable'
+      ...
+
+
 Disable Contrail API authentication
 -----------------------------------
 
diff --git a/opencontrail/files/3.0/contrail-api.conf b/opencontrail/files/3.0/contrail-api.conf
index 64aebc6..dbe1b77 100644
--- a/opencontrail/files/3.0/contrail-api.conf
+++ b/opencontrail/files/3.0/contrail-api.conf
@@ -36,6 +36,9 @@
 {%- if config.message_queue.password is defined %}
 rabbit_password={{config.message_queue.password}}
 {%- endif %}
+{% if config.override_rpf_default_by is defined %}
+override_rpf_default_by={{ config.override_rpf_default_by | lower }}
+{% endif %}
 
 [SECURITY]
 use_certs=False
diff --git a/opencontrail/files/4.0/contrail-api.conf b/opencontrail/files/4.0/contrail-api.conf
index 729a6e3..c14610f 100644
--- a/opencontrail/files/4.0/contrail-api.conf
+++ b/opencontrail/files/4.0/contrail-api.conf
@@ -32,6 +32,9 @@
 {%- if config.message_queue.password is defined %}
 rabbit_password={{config.message_queue.password}}
 {%- endif %}
+{% if config.override_rpf_default_by is defined %}
+override_rpf_default_by={{ config.override_rpf_default_by | lower }}
+{% endif %}
 
 # (StrOpt) default encoding to use for string resources.
 # this is optional variable. Define it if you want to override