diff --git a/README.txt b/README.txt
index 7ffdf98d27a..5003d65a415 100644
--- a/README.txt
+++ b/README.txt
@@ -20,6 +20,9 @@ Apache HBase is made available under the Apache License, version 2.0 [7]
 
 The HBase mailing lists and archives are listed here [8].
 
+The HBase distribution includes cryptographic software. See the export control
+notice here [9].
+
 1. http://hbase.apache.org
 2. http://labs.google.com/papers/bigtable.html
 3. http://hadoop.apache.org
@@ -28,3 +31,4 @@ The HBase mailing lists and archives are listed here [8].
 6. http://hbase.apache.org/docs/current/issue-tracking.html
 7. http://hbase.apache.org/docs/current/license.html
 8. http://hbase.apache.org/docs/current/mail-lists.html
+9. http://hbase.apache.org/docs/current/export-notice.html
diff --git a/src/main/site/xdoc/export_control.xml b/src/main/site/xdoc/export_control.xml
new file mode 100644
index 00000000000..0bd00e14b37
--- /dev/null
+++ b/src/main/site/xdoc/export_control.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+  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.
+-->
+
+<!DOCTYPE document PUBLIC "-//APACHE//DTD Documentation V2.0//EN"
+          "http://forrest.apache.org/dtd/document-v20.dtd">
+
+<document xmlns="http://maven.apache.org/XDOC/2.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/XDOC/2.0 http://maven.apache.org/xsd/xdoc-2.0.xsd">
+  <properties>
+    <title>
+      Export Control
+    </title>
+  </properties>
+  <body>
+  <section name="Export Control">
+<p>
+This distribution uses or includes cryptographic software. The country in
+which you currently reside may have restrictions on the import, possession,
+use, and/or re-export to another country, of encryption software. BEFORE
+using any encryption software, please check your country's laws, regulations
+and policies concerning the import, possession, or use, and re-export of
+encryption software, to see if this is permitted. See the
+<a href="http://www.wassenaar.org/">Wassenaar Arrangement</a> for more
+information.</p>
+<p>
+The U.S. Government Department of Commerce, Bureau of Industry and Security 
+(BIS), has classified this software as Export Commodity Control Number (ECCN) 
+5D002.C.1, which includes information security software using or performing 
+cryptographic functions with asymmetric algorithms. The form and manner of this
+Apache Software Foundation distribution makes it eligible for export under the 
+License Exception ENC Technology Software Unrestricted (TSU) exception (see the
+BIS Export Administration Regulations, Section 740.13) for both object code and
+source code.</p>
+<p>
+Apache HBase uses the built-in java cryptography libraries. See Oracle's
+information regarding
+<a href="http://www.oracle.com/us/products/export/export-regulations-345813.html">Java cryptographic export regulations</a>
+for more details.</p>
+  </section>
+  </body>
+</document>
diff --git a/src/main/site/xdoc/index.xml b/src/main/site/xdoc/index.xml
index 972d2e888a6..e9e020eed30 100644
--- a/src/main/site/xdoc/index.xml
+++ b/src/main/site/xdoc/index.xml
@@ -63,6 +63,9 @@ Apache HBase is an open-source, distributed, versioned, non-relational database
    <p>See the <a href="http://hbase.apache.org/book/architecture.html#arch.overview">Architecture Overview</a>, the <a href="http://hbase.apache.org/book/faq.html">Apache HBase Reference Guide FAQ</a>,
     and the other documentation links on the left!
    </p>
+     <h4>Export Control</h4>
+   <p>The HBase distribution includes cryptographic software. See the export control notice <a href="export_control.html">here</a>
+   </p>
  </section>
      <section name="News">
          <p>May 5th, 2014 <a href="http://www.hbasecon.com">HBaseCon2014</a> at the Hilton San Francisco on Union Square</p>
