diff --git a/inbox/geoloc-dataform.xml b/inbox/geoloc-dataform.xml
new file mode 100644
index 00000000..93d8e2cc
--- /dev/null
+++ b/inbox/geoloc-dataform.xml
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE xep SYSTEM 'xep.dtd' [
+  <!ENTITY % ents SYSTEM 'xep.ent'>
+%ents;
+]>
+<?xml-stylesheet type='text/xsl' href='xep.xsl'?>
+<xep>
+  <header>
+    <title>Data Forms Geolocation Element</title>
+    <abstract>This specification defines an XMPP protocol extension for including geolocation data in XEP-0004 data forms.</abstract>
+    &LEGALNOTICE;
+    <number>xxxx</number>
+    <status>ProtoXEP</status>
+    <type>Standards Track</type>
+    <sig>Standards</sig>
+    <dependencies>
+      <spec>XMPP Core</spec>
+      <spec>XEP-0004</spec>
+      <spec>XEP-0080</spec>
+    </dependencies>
+    <supersedes>None</supersedes>
+    <supersededby>None</supersededby>
+    <shortname>geolocation-element</shortname>
+    <schemaloc>
+      <url>http://www.xmpp.org/schemas/geolocation-element.xsd</url>
+    </schemaloc>
+    <author>
+      <firstname>Michael</firstname>
+      <surname>Laukner</surname>
+      <email>laukner@gmail.com</email>
+      <jid>laukner@jabber.org</jid>
+    </author>
+    <revision>
+      <version>0.0.1</version>
+      <date>2014-06-11</date>
+      <initials>ml</initials>
+      <remark>
+        <p>Initial version, borrowing from XEP-0221.</p>
+      </remark>
+    </revision>
+  </header>
+  <section1 topic="Introduction" anchor="intro">
+    <p>In certain protocols that make use of &xep0004;, it can be helpful to include geolocation data. One example of such a "using protocol" is &xep0346;. This document defines a method for including geolocation data in a data form for something you manage and want to publish. This XEP leaves it open to developers how such a &lt;geoloc/&gt; form element will be rendered; possibilities might include editing Latitude and Longitude manually or through a rendered map.</p>
+  </section1>
+  <section1 topic="Geolocation Element" anchor="geolocation">
+    <p>The root element for geolocation data is &lt;geoloc/&gt; as defined in &xep0080;. The information is structured by means of a &lt;geoloc /> element that is qualified by the 'http://jabber.org/protocol/geoloc' namespace. The &lt;geoloc/&gt; element MUST be contained within a &lt;field/&gt; element qualified by the 'jabber:x:data' namespace.</p>
+    <p>The following example is provided only for the purpose of illustration; consult the specifications for using protocols (e.g., &xep0080;) to see canonical examples.</p>
+    <example caption="Inclusion in Data Form"><![CDATA[<x xmlns='jabber:x:data' type='form'>
+  [ ... ]
+   <field var='location'>
+     <geoloc xmlns="http://jabber.org/protocol/geoloc">
+        <text>Venice, Italy</text>
+        <locality>Venice</locality>
+        <country>Italy</country>
+        <lat>45.44</lat>
+        <lon>12.33</lon>
+     </geoloc>
+   </field>
+   [ ... ]
+</x>]]></example>
+  </section1>
+  <section1 topic="Security Considerations" anchor="security">
+    <p>It is imperative to control access to location information, at least by default. Imagine that a stalker got unauthorized access to this information, with enough accuracy and timeliness to be able to find the target person. This scenario could lead to loss of life, so please take access control checks seriously. If an error is deliberately added to a location, the error SHOULD be the same for all receivers, to minimize the likelihood of triangulation. In the case of deliberate error, the &lt;accuracy /> element SHOULD NOT be included.</p>
+  </section1>
+  <section1 topic="IANA Considerations" anchor="iana">
+    <p>This document requires no interaction with the &IANA;.</p>
+  </section1>
+  <section1 topic="XMPP Registrar Considerations" anchor="registrar">
+    <section2 topic="Protocol Namespaces" anchor="ns">
+      <p>
+        The &REGISTRAR; already includes 'http://jabber.org/protocol/geoloc' in its registry of protocol namespaces (see &NAMESPACES;).
+      </p>
+    </section2>
+  </section1>
+  <section1 topic="XML Schema" anchor="schema">
+    <p>As this document only defines semantics for existing protocol, additional schemas are not required.</p>
+  </section1>
+</xep>