diff --git a/appimage/entrypoint.sh b/appimage/entrypoint.sh
new file mode 100644
index 000000000..91ee2ecd4
--- /dev/null
+++ b/appimage/entrypoint.sh
@@ -0,0 +1 @@
+{{ python-executable }} -u "${APPDIR}/opt/python{{ python-version }}/bin/xonsh" "$@"
diff --git a/appimage/pre-requirements.txt b/appimage/pre-requirements.txt
new file mode 100644
index 000000000..cafde81be
--- /dev/null
+++ b/appimage/pre-requirements.txt
@@ -0,0 +1,2 @@
+prompt_toolkit
+Pygments
diff --git a/appimage/xonsh.appdata.xml b/appimage/xonsh.appdata.xml
new file mode 100644
index 000000000..178856a44
--- /dev/null
+++ b/appimage/xonsh.appdata.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>xonsh</id>
+    <metadata_license>MIT</metadata_license>
+    <project_license>Python-2.0</project_license>
+    <name>Xonsh</name>
+    <summary>Xonsh on Python {{ python-fullversion }}</summary>
+    <description>
+        <p>  Python {{ python-fullversion }} + Xonsh bundled in an AppImage.
+        </p>
+    </description>
+    <launchable type="desktop-id">xonsh.desktop</launchable>
+    <url type="homepage">http://xon.sh</url>
+    <provides>
+        <binary>python{{ python-version }}</binary>
+    </provides>
+</component>
diff --git a/appimage/xonsh.desktop b/appimage/xonsh.desktop
new file mode 100644
index 000000000..8de6fcc03
--- /dev/null
+++ b/appimage/xonsh.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=xonsh
+Exec=xonsh
+Comment=Xonsh on Python {{ python-fullversion }}
+Icon=python
+Categories=System;
+Terminal=true
diff --git a/news/rever_appimage.rst b/news/rever_appimage.rst
new file mode 100644
index 000000000..4a6793d32
--- /dev/null
+++ b/news/rever_appimage.rst
@@ -0,0 +1,23 @@
+**Added:**
+
+* Added xonsh AppImage to the GitHub release assets
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>
diff --git a/rever.xsh b/rever.xsh
index 43f354d11..7fcbc2daf 100644
--- a/rever.xsh
+++ b/rever.xsh
@@ -1,6 +1,6 @@
 $PROJECT = $GITHUB_ORG = $GITHUB_REPO = 'xonsh'
 $WEBSITE_URL = 'http://xon.sh'
-$ACTIVITIES = ['authors', 'version_bump', 'changelog', 'pytest',
+$ACTIVITIES = ['authors', 'version_bump', 'changelog', 'pytest', 'appimage'
                'tag', 'push_tag', 'ghrelease', 'sphinx',
                'ghpages', 'pypi', 'conda_forge',
                ]
@@ -35,3 +35,5 @@ $DOCKER_INSTALL_COMMAND = ('rm -rf .cache/ __pycache__/ */__pycache__ */*/__pyca
                            './setup.py install')
 $DOCKER_GIT_NAME = 'xonsh'
 $DOCKER_GIT_EMAIL = 'xonsh@googlegroups.com'
+
+$GHRELEASE_ASSETS = ['xonsh-x86_64.AppImage']
\ No newline at end of file