diff --git a/recipe/bld.bat b/recipe/bld.bat
index 36aedba35..15934f245 100644
--- a/recipe/bld.bat
+++ b/recipe/bld.bat
@@ -1 +1,4 @@
-python setup.py install --conda
\ No newline at end of file
+python setup.py install --conda
+
+copy "%RECIPE_DIR%\xonsh_shortcut.json" "%PREFIX%\Menu\xonsh_shortcut.json"
+copy "%RECIPE_DIR%\xonsh.ico" "%PREFIX%\Menu\xonsh.ico"
\ No newline at end of file
diff --git a/recipe/build.sh b/recipe/build.sh
new file mode 100644
index 000000000..de88d7fe7
--- /dev/null
+++ b/recipe/build.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+$PYTHON setup.py install --conda
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index 0e423f82c..dc94bbb2f 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -6,7 +6,6 @@ source:
    path: ../
 
 build:
-  script: python setup.py install --conda
   number: {{ environ.get('GIT_DESCRIBE_NUMBER', 0) }}
   entry_points:
     - xonsh = xonsh.main:main
@@ -20,13 +19,14 @@ requirements:
   run:
     - python
     - ply
-    - prompt_toolkit  # [win]
+    - prompt_toolkit
 
 about:
   home: http://xonsh.org/
   license: BSD
   summary: xonsh is a Python-ish, BASHwards-compatible shell.
 
-app:
-  entry: xonsh
-  icon: ../docs/_static/ascii_conch_part_color.png
+# Removed temporarily until this is better support by the Anaconda launcher
+#app:
+#  entry: xonsh
+#  icon: icon.png
diff --git a/recipe/xonsh.ico b/recipe/xonsh.ico
new file mode 100644
index 000000000..1d1a7d11f
Binary files /dev/null and b/recipe/xonsh.ico differ
diff --git a/recipe/xonsh_shortcut.json b/recipe/xonsh_shortcut.json
new file mode 100644
index 000000000..4834f97b6
--- /dev/null
+++ b/recipe/xonsh_shortcut.json
@@ -0,0 +1,11 @@
+{
+    "menu_name": "Anaconda${PY_VER} ${PLATFORM}",
+    "menu_items":
+    [
+        {
+            "name": "xonsh",
+            "pyscript": "${PYTHON_SCRIPTS}/xonsh-script.py",
+            "icon": "${MENU_DIR}/xonsh.ico"
+        }
+    ]
+}