diff --git a/mingw-w64-python-nuitka/001-nuitka-0.6.18-restore-console-scripts.patch b/mingw-w64-python-nuitka/001-nuitka-0.6.18-restore-console-scripts.patch
deleted file mode 100644
index 08268a805a..0000000000
--- a/mingw-w64-python-nuitka/001-nuitka-0.6.18-restore-console-scripts.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/setup.py b/setup.py
-index d9a7b7b38..45c40bf0b 100644
---- a/setup.py
-+++ b/setup.py
-@@ -41,7 +41,7 @@ from nuitka.PythonFlavors import isMSYS2MingwPython
- scripts = []
- 
- # For Windows, there are batch files to launch Nuitka.
--if os.name == "nt" and not isMSYS2MingwPython():
-+if os.name == "nt":
-     scripts += ["misc/nuitka.bat", "misc/nuitka-run.bat"]
- 
- 
-@@ -274,13 +274,10 @@ else:
- 
- binary_suffix = "%d" % sys.version_info[0]
- 
--if os.name == "nt" and not isMSYS2MingwPython():
--    console_scripts = []
--else:
--    console_scripts = [
--        "nuitka%s = nuitka.__main__:main" % binary_suffix,
--        "nuitka%s-run = nuitka.__main__:main" % binary_suffix,
--    ]
-+console_scripts = [
-+    "nuitka%s = nuitka.__main__:main" % binary_suffix,
-+    "nuitka%s-run = nuitka.__main__:main" % binary_suffix,
-+]
- 
- 
- with open("README.rst", "rb") as input_file:
diff --git a/mingw-w64-python-nuitka/PKGBUILD b/mingw-w64-python-nuitka/PKGBUILD
index cd4e96d71d..ea5e2bebeb 100644
--- a/mingw-w64-python-nuitka/PKGBUILD
+++ b/mingw-w64-python-nuitka/PKGBUILD
@@ -6,7 +6,7 @@ pkgname=("${MINGW_PACKAGE_PREFIX}-python-${_realname}")
 provides=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 conflicts=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
 replaces=("${MINGW_PACKAGE_PREFIX}-python3-${_realname}")
-pkgver=0.6.18.4
+pkgver=0.6.18.5
 pkgrel=1
 pkgdesc="Python to native compiler (mingw-w64)"
 arch=('any')
@@ -15,20 +15,15 @@ license=('APACHE')
 url="https://www.nuitka.net/"
 depends=("${MINGW_PACKAGE_PREFIX}-python")
 makedepends=("${MINGW_PACKAGE_PREFIX}-python-setuptools")
-source=("https://nuitka.net/releases/Nuitka-${pkgver}.tar.gz"
-        '001-nuitka-0.6.18-restore-console-scripts.patch')
+source=("https://nuitka.net/releases/Nuitka-${pkgver}.tar.gz")
 noextract=(Nuitka-$pkgver.tar.gz)
-sha256sums=('d28cdc0b6ea64097397a9e4ee761513a5097468a0493676ff6028c8712f4530b'
-            'SKIP')
+sha256sums=('3a395146e978bd1d37fe4c1671b067c03b46c760f74269e5711bf04b6433689a')
 
 prepare() {
   [[ -d $srcdir/${_realname}-${pkgver} ]] && rm -rf ${srcdir}/${_realname}-${pkgver}
   tar -xzvf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir} || \
   tar -xzvf ${srcdir}/${_realname}-${pkgver}.tar.gz -C ${srcdir}
 
-  cd "${srcdir}/Nuitka-${pkgver}"
-  patch -p1 -i ${srcdir}/001-nuitka-0.6.18-restore-console-scripts.patch
-
   cd "${srcdir}"
   rm -rf python-build-${MSYSTEM} | true
   cp -r "Nuitka-${pkgver}" "python-build-${MSYSTEM}"
@@ -47,14 +42,9 @@ package() {
   MSYS2_ARG_CONV_EXCL="--prefix=;--install-scripts=;--install-platlib=" \
   ${MINGW_PREFIX}/bin/python setup.py install --prefix=${MINGW_PREFIX} --root="${pkgdir}" -O1 --skip-build
 
-  mv "${pkgdir}${MINGW_PREFIX}"/bin/nuitka.bat "${pkgdir}${MINGW_PREFIX}"/bin/nuitka3.bat
-  mv "${pkgdir}${MINGW_PREFIX}"/bin/nuitka-run.bat "${pkgdir}${MINGW_PREFIX}"/bin/nuitka3-run.bat
-  pushd "${pkgdir}${MINGW_PREFIX}"/bin > /dev/null
-  for filename in nuitka3 nuitka3-run; do
-    sed -e "s|...\python|python3|g" \
-        -i ${filename}.bat
-    sed -e "s|${_mingw_prefix}/bin/|/usr/bin/env |g" -i ${filename}-script.py
+  for _f in "${pkgdir}${MINGW_PREFIX}"/bin/*-script.py; do
+    sed -e '1 { s/^#!.*$// }' -i ${_f}
   done
-  popd > /dev/null
 
+  install -Dm644 LICENSE.txt "${pkgdir}${MINGW_PREFIX}/share/licenses/python-${_realname}/LICENSE.txt"
 }