diff --git a/mingw-w64-atom-shell/0001-python-python2.patch b/mingw-w64-atom-shell/0001-python-python2.patch
new file mode 100644
index 0000000000..6dbaa657c5
--- /dev/null
+++ b/mingw-w64-atom-shell/0001-python-python2.patch
@@ -0,0 +1,242 @@
+From b039dac0d007212b9de9b9c81abbf20bf4cfb871 Mon Sep 17 00:00:00 2001
+From: Ray Donnelly <mingw.android@gmail.com>
+Date: Mon, 22 Sep 2014 21:09:54 +0100
+Subject: [PATCH] python -> python2
+
+---
+ script/bootstrap.py                      | 2 +-
+ script/build.py                          | 2 +-
+ script/bump-version.py                   | 2 +-
+ script/coffeelint.py                     | 2 +-
+ script/compile-coffee.py                 | 2 +-
+ script/cpplint.py                        | 2 +-
+ script/create-dist.py                    | 2 +-
+ script/lib/config.py                     | 2 +-
+ script/lib/github.py                     | 2 +-
+ script/lib/util.py                       | 2 +-
+ script/pylint.py                         | 2 +-
+ script/test.py                           | 2 +-
+ script/update-external-binaries.py       | 2 +-
+ script/update.py                         | 2 +-
+ script/upload-checksums.py               | 2 +-
+ script/upload.py                         | 2 +-
+ tools/atom_source_root.py                | 2 +-
+ tools/copy_binary.py                     | 2 +-
+ tools/mac/apply_locales.py               | 2 +-
+ tools/posix/generate_breakpad_symbols.py | 2 +-
+ tools/win/generate_breakpad_symbols.py   | 2 +-
+ 21 files changed, 21 insertions(+), 21 deletions(-)
+
+diff --git a/script/bootstrap.py b/script/bootstrap.py
+index 516e0b4..25fc1b2 100755
+--- a/script/bootstrap.py
++++ b/script/bootstrap.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import argparse
+ import os
+diff --git a/script/build.py b/script/build.py
+index 1dd60de..6442cdc 100755
+--- a/script/build.py
++++ b/script/build.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import argparse
+ import os
+diff --git a/script/bump-version.py b/script/bump-version.py
+index d06bd41..c6d9c4a 100755
+--- a/script/bump-version.py
++++ b/script/bump-version.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import os
+ import re
+diff --git a/script/coffeelint.py b/script/coffeelint.py
+index 29f60f9..15266a4 100755
+--- a/script/coffeelint.py
++++ b/script/coffeelint.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import glob
+ import os
+diff --git a/script/compile-coffee.py b/script/compile-coffee.py
+index 179931a..8f051a4 100755
+--- a/script/compile-coffee.py
++++ b/script/compile-coffee.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import os
+ import subprocess
+diff --git a/script/cpplint.py b/script/cpplint.py
+index fdd40e4..adee70e 100755
+--- a/script/cpplint.py
++++ b/script/cpplint.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import fnmatch
+ import os
+diff --git a/script/create-dist.py b/script/create-dist.py
+index e623b08..ce1340d 100755
+--- a/script/create-dist.py
++++ b/script/create-dist.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import argparse
+ import os
+diff --git a/script/lib/config.py b/script/lib/config.py
+index c1d5452..71bbc3a 100644
+--- a/script/lib/config.py
++++ b/script/lib/config.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import platform
+ import sys
+diff --git a/script/lib/github.py b/script/lib/github.py
+index a742a20..575e31b 100644
+--- a/script/lib/github.py
++++ b/script/lib/github.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import json
+ import re
+diff --git a/script/lib/util.py b/script/lib/util.py
+index 83c3e05..6bbded5 100644
+--- a/script/lib/util.py
++++ b/script/lib/util.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import atexit
+ import contextlib
+diff --git a/script/pylint.py b/script/pylint.py
+index 4aba391..4bea5f7 100755
+--- a/script/pylint.py
++++ b/script/pylint.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import glob
+ import os
+diff --git a/script/test.py b/script/test.py
+index c21e52a..4d0dae2 100755
+--- a/script/test.py
++++ b/script/test.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import os
+ import subprocess
+diff --git a/script/update-external-binaries.py b/script/update-external-binaries.py
+index 5bb9801..b30cb03 100755
+--- a/script/update-external-binaries.py
++++ b/script/update-external-binaries.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import errno
+ import sys
+diff --git a/script/update.py b/script/update.py
+index 61eb408..6f4fe0b 100755
+--- a/script/update.py
++++ b/script/update.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import os
+ import subprocess
+diff --git a/script/upload-checksums.py b/script/upload-checksums.py
+index 34a58fc..85b9bbd 100755
+--- a/script/upload-checksums.py
++++ b/script/upload-checksums.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import argparse
+ import hashlib
+diff --git a/script/upload.py b/script/upload.py
+index 2ad7f5f..0ca32ec 100755
+--- a/script/upload.py
++++ b/script/upload.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import argparse
+ import errno
+diff --git a/tools/atom_source_root.py b/tools/atom_source_root.py
+index 93de124..a881d9d 100755
+--- a/tools/atom_source_root.py
++++ b/tools/atom_source_root.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import os
+ 
+diff --git a/tools/copy_binary.py b/tools/copy_binary.py
+index a21b652..9051659 100755
+--- a/tools/copy_binary.py
++++ b/tools/copy_binary.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ 
+ import os
+ import shutil
+diff --git a/tools/mac/apply_locales.py b/tools/mac/apply_locales.py
+index a657aa7..d482dc8 100755
+--- a/tools/mac/apply_locales.py
++++ b/tools/mac/apply_locales.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # Copyright (c) 2009 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+ # found in the LICENSE file.
+diff --git a/tools/posix/generate_breakpad_symbols.py b/tools/posix/generate_breakpad_symbols.py
+index 770f5b0..c9abbb0 100755
+--- a/tools/posix/generate_breakpad_symbols.py
++++ b/tools/posix/generate_breakpad_symbols.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # Copyright (c) 2013 GitHub, Inc. All rights reserved.
+ # Copyright (c) 2013 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+diff --git a/tools/win/generate_breakpad_symbols.py b/tools/win/generate_breakpad_symbols.py
+index d5d0a8f..a8076ea 100644
+--- a/tools/win/generate_breakpad_symbols.py
++++ b/tools/win/generate_breakpad_symbols.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2
+ # Copyright (c) 2013 GitHub, Inc. All rights reserved.
+ # Copyright (c) 2013 The Chromium Authors. All rights reserved.
+ # Use of this source code is governed by a BSD-style license that can be
+-- 
+2.1.1
+
diff --git a/mingw-w64-atom-shell/PKGBUILD b/mingw-w64-atom-shell/PKGBUILD
new file mode 100644
index 0000000000..ec769f0c11
--- /dev/null
+++ b/mingw-w64-atom-shell/PKGBUILD
@@ -0,0 +1,38 @@
+# Maintainer: Ray Donnelly <mingw.android@gmail.com>
+
+_realname=atom-shell
+pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}-git"
+pkgver=r2246.50ea0f0
+pkgrel=1
+pkgdesc='Cross-platform desktop application shell (mingw-w64)'
+source=("${_realname}-${CARCH}"::"git://github.com/atom/atom-shell.git#branch=master"
+        "0001-python-python2.patch")
+arch=('any')
+url='https://atom.io'
+license=('MIT')
+options=()
+shasums=('SKIP')
+makedepends=("${MINGW_PACKAGE_PREFIX}-ninja")
+
+pkgver() {
+  cd "$srcdir"/${_realname}-${CARCH}
+  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+}
+
+prepare() {
+  cd "$srcdir"/${_realname}-${CARCH}
+  git am "$srcdir"/0001-python-python2.patch
+}
+
+build() {
+  cd "$srcdir"/${_realname}-${CARCH}
+  ./script/build.py
+}
+
+
+package() {
+  echo "NYI"
+}
+
+md5sums=('SKIP'
+         '4adb33db2460090857ee22f85c23dd84')