diff --git a/setup.py b/setup.py
index 112b2af12..a21e61f58 100755
--- a/setup.py
+++ b/setup.py
@@ -136,6 +136,8 @@ def main():
         platforms='Cross Platform',
         classifiers=['Programming Language :: Python :: 3'],
         packages=['xonsh', 'xonsh.ptk', 'xonsh.parsers', 'xontrib'],
+        package_dir={'xonsh': 'xonsh', 'xontrib': 'xontrib'},
+        package_data={'xonsh': ['*.json'], 'xontrib': ['*.xsh']},
         cmdclass={'install': xinstall, 'sdist': xsdist},
         )
     if HAVE_SETUPTOOLS:
diff --git a/xonsh/xontribs.json b/xonsh/xontribs.json
new file mode 100644
index 000000000..ea8dbe2a5
--- /dev/null
+++ b/xonsh/xontribs.json
@@ -0,0 +1,20 @@
+{"xontribs": [
+ {"name": "mpl",
+  "package": "xonsh",
+  "url": "http://xon.sh",
+  "description": ["Matplotlib hooks for xonsh, including the new 'mpl' alias ",
+                  "that dumps the current figure to the screen."]
+  }
+ ],
+ "packages": {
+  "xonsh": {
+   "license": "BSD 3-clause",
+   "url": "http://xon.sh",
+   "install": {
+    "conda": "conda install -c conda-forge xonsh",
+    "pip": "pip install xonsh",
+    "aura": "sudo aura -A xonsh",
+    "yaourt": "yaourt -Sa xonsh"}
+   }
+ }
+}
\ No newline at end of file
diff --git a/xontribs.json b/xontribs.json
new file mode 120000
index 000000000..30f57f4c6
--- /dev/null
+++ b/xontribs.json
@@ -0,0 +1 @@
+xonsh/xontribs.json
\ No newline at end of file