diff --git a/app/helpers/page_layout_helper.rb b/app/helpers/page_layout_helper.rb
index 3286a92a8a7d3023f860315c78070a797efe9f33..c56d3395800ff6ca3dba7b120ab34a04de041aae 100644
--- a/app/helpers/page_layout_helper.rb
+++ b/app/helpers/page_layout_helper.rb
@@ -121,4 +121,13 @@ module PageLayoutHelper
 
     css_class
   end
+
+  def should_render_icp?
+    extra_config.has_key?('ICP')
+    # TODO render ICP only for requests from China
+  end
+
+  def render_icp
+    link_to extra_config.ICP, "http://www.miibeian.gov.cn/"
+  end
 end
diff --git a/app/views/layouts/_page.html.haml b/app/views/layouts/_page.html.haml
index 12556dab128567118f437fac4ce95d49498533d0..049b33253ac32567d35616180c5a23ace923568b 100644
--- a/app/views/layouts/_page.html.haml
+++ b/app/views/layouts/_page.html.haml
@@ -20,3 +20,6 @@
     = link_to "About GitLab", "https://about.gitlab.com/"
     |
     = link_to "About Nexedi", "http://www.nexedi.com/" 
+    - if should_render_icp?
+      |
+      = render_icp
diff --git a/app/views/layouts/devise.html.haml b/app/views/layouts/devise.html.haml
index 7ea6cf9f7a40fc6ac32a48cdfada9ade4c91e15b..7c721d4e3166b11e88406dfa2cdd84859b19a0fd 100644
--- a/app/views/layouts/devise.html.haml
+++ b/app/views/layouts/devise.html.haml
@@ -36,3 +36,5 @@
           = link_to "Help", help_path
           = link_to "About GitLab", "https://about.gitlab.com/"
           = link_to "About Nexedi", "http://www.nexedi.com/"
+          - if should_render_icp?
+            = render_icp
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example
index 3c70f35b9d07ef2a268892c37bd0563ac75a089b..ccec8a01fa4c7a66e0e8100c86570b7cef889996 100644
--- a/config/gitlab.yml.example
+++ b/config/gitlab.yml.example
@@ -539,6 +539,9 @@ production: &base
     # piwik_url: '_your_piwik_url'
     # piwik_site_id: '_your_piwik_site_id'
 
+    ## Site ICP number
+    # ICP: '_your_site_icp_'
+
   rack_attack:
     git_basic_auth:
       # Rack Attack IP banning enabled