diff --git a/make-standalone.bat b/make-standalone.bat
index a3c3fca..2f89afa 100644
--- a/make-standalone.bat
+++ b/make-standalone.bat
@@ -1,6 +1,6 @@
 mkdir build
 mkdir dist
-cxfreeze ci-gui.py --target-dir=build\custom-install-standalone --base-name=Win32GUI
+python setup-cxfreeze.py build_exe --build-exe=build\custom-install-standalone
 mkdir build\custom-install-standalone\bin
 copy TaskbarLib.tlb build\custom-install-standalone
 copy bin\win32\save3ds_fuse.exe build\custom-install-standalone\bin
@@ -8,5 +8,6 @@ copy bin\README build\custom-install-standalone\bin
 copy custom-install-finalize.3dsx build\custom-install-standalone
 copy title.db.gz build\custom-install-standalone
 copy extras\windows-quickstart.txt build\custom-install-standalone
+copy extras\run_with_cmd.bat build\custom-install-standalone
 copy LICENSE.md build\custom-install-standalone
 python -m zipfile -c dist\custom-install-standalone.zip build\custom-install-standalone
diff --git a/setup-cxfreeze.py b/setup-cxfreeze.py
new file mode 100644
index 0000000..2f4ae49
--- /dev/null
+++ b/setup-cxfreeze.py
@@ -0,0 +1,19 @@
+import sys
+from cx_Freeze import setup, Executable
+
+if sys.platform == 'win32':
+    executables = [
+        Executable('ci-gui.py', target_name='ci-gui-console'),
+        Executable('ci-gui.py', target_name='ci-gui', base='Win32GUI'),
+    ]
+else:
+    executables = [
+        Executable('ci-gui.py', target_name='ci-gui'),
+    ]
+
+setup(
+    name = "ci-gui",
+    version = "2.1b4",
+    description = "Installs a title directly to an SD card for the Nintendo 3DS",
+    executables = executables
+)