diff --git a/mingw-w64-nim/PKGBUILD b/mingw-w64-nim/PKGBUILD
index 28ba275f55..d82209ff7e 100644
--- a/mingw-w64-nim/PKGBUILD
+++ b/mingw-w64-nim/PKGBUILD
@@ -6,7 +6,7 @@ _realname=nim
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.19.0
-pkgrel=2
+pkgrel=3
 pkgdesc='Imperative, multi-paradigm, compiled programming language (mingw-w64)'
 arch=('any')
 url='https://nim-lang.org/'
@@ -68,7 +68,7 @@ build() {
   pushd tools
   nim c -d:release nimgrep.nim
   popd
-  
+
   msg2 "Building nimsuggest"
   nim c -d:release nimsuggest/nimsuggest.nim
 }
@@ -99,6 +99,8 @@ package() {
   mkdir -p "${pkgdir}${MINGW_PREFIX}/share/nim/doc"
   cp -r "examples" "web" "${pkgdir}${MINGW_PREFIX}/share/nim/doc/"
   cp -r "doc"/* "${pkgdir}${MINGW_PREFIX}/share/nim/doc/"
+  mkdir -p "${pkgdir}${MINGW_PREFIX}/lib/nim/doc"
+  cp doc/{basicopt.txt,advopt.txt} "${pkgdir}${MINGW_PREFIX}/lib/nim/doc/"
 
   mkdir -p "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}"
   cp "copying.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
@@ -106,4 +108,6 @@ package() {
   # clean up after koch install
   rm -r "${pkgdir}/nim"
   rm -f ${pkgdir}${MINGW_PREFIX}/bin/*.txt
+  rm -r ${pkgdir}${MINGW_PREFIX}/lib/nim/*.dll
+  rm -r ${pkgdir}${MINGW_PREFIX}/lib/nim/compiler/*.exe
 }
diff --git a/mingw-w64-nimble/PKGBUILD b/mingw-w64-nimble/PKGBUILD
index 4b2c07b514..aab7c7b9d9 100644
--- a/mingw-w64-nimble/PKGBUILD
+++ b/mingw-w64-nimble/PKGBUILD
@@ -3,26 +3,25 @@
 _realname=nimble
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.6.2
+pkgver=0.9.0
 pkgrel=1
 pkgdesc='Package manager for the Nim programming language (mingw-w64)'
 arch=('any')
 url='https://github.com/nim-lang/nimble'
 license=('BSD')
-makedepends=('git'
-             "${MINGW_PACKAGE_PREFIX}-nim")
-source=("${_realname}::git+https://github.com/nim-lang/nimble.git#tag=v${pkgver}")
-sha256sums=('SKIP')
+makedepends=("${MINGW_PACKAGE_PREFIX}-nim")
+source=("${_realname}-${pkgver}.tar.gz"::https://github.com/nim-lang/nimble/archive/v${pkgver}.tar.gz)
+sha256sums=('d02cc0b1787fa30e6d88a1ee7aa067c1555b7763d2716742d1d10132df550456')
 
 build() {
-  cd "${srcdir}/${_realname}/src"
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  nim c -d:release nimble.nim
+  nim c -d:release src/nimble.nim
 }
 
 package() {
-  cd "${srcdir}/${_realname}"
+  cd "${srcdir}/${_realname}-${pkgver}"
 
-  cp "src/nimble.exe" "${pkgdir}${MINGW_PREFIX}/bin"
-  cp "license.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
+  install -Dm 755 "src/nimble.exe" -t "${pkgdir}${MINGW_PREFIX}/bin/"
+  install -Dm 644  "license.txt" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }