diff --git a/doc/epp/README.md b/doc/epp/README.md
index ec4016ab23..a825f995ad 100644
--- a/doc/epp/README.md
+++ b/doc/epp/README.md
@@ -33,6 +33,7 @@
 * [epp-ee-1.0.xsd](/lib/schemas/epp-ee-1.0.xsd)
 * [domain-ee-1.2.xsd](/lib/schemas/domain-ee-1.2.xsd)
 * [contact-ee-1.1.xsd](/lib/schemas/contact-ee-1.1.xsd)
+* [ee-1.1.xsd](/lib/schemas/ee-1.1.xsd)
 
 More info about The Extensible Provisioning Protocol (EPP):
 http://en.wikipedia.org/wiki/Extensible_Provisioning_Protocol
diff --git a/lib/schemas/all-ee-1.3.xsd b/lib/schemas/all-ee-1.3.xsd
index 305cce2311..d9e3991df6 100644
--- a/lib/schemas/all-ee-1.3.xsd
+++ b/lib/schemas/all-ee-1.3.xsd
@@ -27,7 +27,7 @@
       schemaLocation="lib/schemas/host-1.0.xsd"/>
     <!-- EPP protocol extension: .ee specific -->
     <import namespace="https://epp.tld.ee/schema/eis-1.0"
-      schemaLocation="lib/schemas/eis-1.0.xsd"/>
+      schemaLocation="lib/schemas/ee-1.1.xsd"/>
     <import namespace="https://epp.tld.ee/schema/contact-ee-1.1"
       schemaLocation="lib/schemas/contact-ee-1.1.xsd"/>
     <import namespace="https://epp.tld.ee/schema/domain-ee-1.2"
diff --git a/lib/schemas/contact-ee-1.1.xsd b/lib/schemas/contact-ee-1.1.xsd
index 6a115bfabc..5a8bf88277 100644
--- a/lib/schemas/contact-ee-1.1.xsd
+++ b/lib/schemas/contact-ee-1.1.xsd
@@ -12,7 +12,7 @@
    -->
     <import namespace="urn:ietf:params:xml:ns:eppcom-1.0"/>
     <import namespace="https://epp.tld.ee/schema/epp-ee-1.0.xsd"/>
-    <import namespace="https://epp.tld.ee/schema/eis-1.0.xsd"/>
+    <import namespace="https://epp.tld.ee/schema/ee-1.1.xsd"/>
 
     <annotation>
       <documentation>
diff --git a/lib/schemas/domain-ee-1.2.xsd b/lib/schemas/domain-ee-1.2.xsd
index 0420dd1345..5e9794bc6c 100644
--- a/lib/schemas/domain-ee-1.2.xsd
+++ b/lib/schemas/domain-ee-1.2.xsd
@@ -15,7 +15,7 @@ Import common element types.
 <import namespace="https://epp.tld.ee/schema/epp-ee-1.0.xsd"/>
 <import namespace="urn:ietf:params:xml:ns:host-1.0"/>
 <import namespace="urn:ietf:params:xml:ns:secDNS-1.1"/>
-<import namespace="https://epp.tld.ee/schema/eis-1.0.xsd"/>
+<import namespace="https://epp.tld.ee/schema/ee-1.1.xsd"/>
 
 <annotation>
   <documentation>
diff --git a/lib/schemas/ee-1.1.xsd b/lib/schemas/ee-1.1.xsd
new file mode 100644
index 0000000000..3e73ac57cd
--- /dev/null
+++ b/lib/schemas/ee-1.1.xsd
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema
+ targetNamespace="https://epp.tld.ee/schema/ee-1.1.xsd"
+ xmlns:eis="https://epp.tld.ee/schema/ee-1.1.xsd"
+ xmlns="http://www.w3.org/2001/XMLSchema"
+ elementFormDefault="qualified">
+
+  <annotation>
+    <documentation>
+     Extensible Provisioning Protocol v1.0 extension schema.
+    </documentation>
+  </annotation>
+
+  <!--
+  Child elements found in EPP commands.
+  -->
+
+  <element name="extdata" type="eis:eisExtType"/>
+
+  <!--
+  Child elements supporting EIS specific values.
+  -->
+  <complexType name="eisExtType">
+    <sequence>
+      <element name="ident" type="eis:identType" minOccurs="0" maxOccurs="1"/>
+      <element name="legalDocument" type="eis:legalDocType" minOccurs="0" maxOccurs="1"/>
+      <element name="reserved" type="eis:reservedType" minOccurs="0" maxOccurs="1"/>
+    </sequence>
+  </complexType>
+
+  <!--
+    Child elements of extdata
+  -->
+
+  <!--
+    Reserved for providing passwords for reserved domains
+  -->
+
+  <complexType name="reservedType">
+    <sequence>
+      <element name="pw" type="eis:pwType" minOccurs="0" maxOccurs="1"/>
+    </sequence>
+  </complexType>
+
+  <simpleType name="pwType">
+     <restriction base="normalizedString">
+       <minLength value="1"/>
+       <maxLength value="255"/>
+     </restriction>
+  </simpleType>
+
+  <!--
+  Legal document, encoded in base64
+  -->
+  <complexType name="legalDocType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="type" type="eis:legalDocEnumType" use="required"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+  <simpleType name="legalDocEnumType">
+    <restriction base="token">
+      <enumeration value="pdf"/>
+      <enumeration value="asice"/>
+      <enumeration value="asics"/>
+      <enumeration value="sce"/>
+      <enumeration value="scs"/>
+      <enumeration value="adoc"/>
+      <enumeration value="bdoc"/>
+      <enumeration value="edoc"/>
+      <enumeration value="zip"/>
+      <enumeration value="rar"/>
+      <enumeration value="gz"/>
+      <enumeration value="tar"/>
+      <enumeration value="7z"/>
+      <enumeration value="odt"/>
+      <enumeration value="doc"/>
+      <enumeration value="docx"/>
+    </restriction>
+  </simpleType>
+
+  <!--
+  Ident with type and country code
+  -->
+  <complexType name="identType">
+    <simpleContent>
+      <extension base="normalizedString">
+        <attribute name="type" type="eis:identEnumType" use="required"/>
+        <attribute name="cc" type="eis:ccType"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+  <simpleType name="identEnumType">
+    <restriction base="token">
+      <enumeration value="org"/>
+      <enumeration value="priv"/>
+      <enumeration value="birthday"/>
+    </restriction>
+  </simpleType>
+
+  <simpleType name="ccType">
+    <restriction base="normalizedString">
+      <minLength value="2"/>
+      <maxLength value="2"/>
+    </restriction>
+  </simpleType>
+</schema>
diff --git a/lib/schemas/eis-1.0.xsd b/lib/schemas/eis-1.0.xsd
index ddb3602c03..cce7d5c16c 100644
--- a/lib/schemas/eis-1.0.xsd
+++ b/lib/schemas/eis-1.0.xsd
@@ -70,7 +70,6 @@
       <enumeration value="adoc"/>
       <enumeration value="bdoc"/>
       <enumeration value="edoc"/>
-      <enumeration value="ddoc"/>
       <enumeration value="zip"/>
       <enumeration value="rar"/>
       <enumeration value="gz"/>