diff --git a/mingw-w64-cfitsio/001-fix-pkgconf.patch b/mingw-w64-cfitsio/001-fix-pkgconf.patch
new file mode 100644
index 0000000000..8572611f94
--- /dev/null
+++ b/mingw-w64-cfitsio/001-fix-pkgconf.patch
@@ -0,0 +1,15 @@
+diff --git a/cfitsio.pc.cmake b/cfitsio.pc.cmake
+index 494ff1aa1c..9babbe81f3 100644
+--- a/cfitsio.pc.cmake
++++ b/cfitsio.pc.cmake
+@@ -1,7 +1,7 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_DESTINATION@
+-includedir=@INCLUDE_INSTALL_DIR@
++exec_prefix=${prefix}
++libdir=${exec_prefix}/lib
++includedir=${prefix}/include
+ 
+ Name: cfitsio
+ Description: FITS File Subroutine Library
diff --git a/mingw-w64-cfitsio/PKGBUILD b/mingw-w64-cfitsio/PKGBUILD
index 46dfe5c8fd..d3ac52be15 100644
--- a/mingw-w64-cfitsio/PKGBUILD
+++ b/mingw-w64-cfitsio/PKGBUILD
@@ -3,7 +3,7 @@
 _realname=cfitsio
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=4.5.0
+pkgver=4.6.0
 pkgrel=1
 epoch=1
 pkgdesc="A library of C and Fortran subroutines for reading and writing data files in FITS (Flexible Image Transport System) data format (mingw-w64)"
@@ -19,15 +19,22 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
              "${MINGW_PACKAGE_PREFIX}-cc"
              "${MINGW_PACKAGE_PREFIX}-pkgconf"
              "${MINGW_PACKAGE_PREFIX}-winpthreads")
-depends=("${MINGW_PACKAGE_PREFIX}-libwinpthread"
+depends=("${MINGW_PACKAGE_PREFIX}-curl"
+         "${MINGW_PACKAGE_PREFIX}-libwinpthread"
          "${MINGW_PACKAGE_PREFIX}-zlib")
-source=("https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${_realname}-${pkgver}.tar.gz")
-sha256sums=('e4854fc3365c1462e493aa586bfaa2f3d0bb8c20b75a524955db64c27427ce09')
+source=("https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/${_realname}-${pkgver}.tar.gz"
+        "001-fix-pkgconf.patch")
+sha256sums=('7c372fdb4e6cf530fc12294ae0b7f1fdd0ed85062790277a60aea56c97b0d3e7'
+            '4ef95693126d8d2d8673b795ca7788f4a9ba84f3cc5a863777dfaa57be0e26f0')
 
 prepare() {
-  # Fix install dir for pc and cmake files
-  # https://github.com/HEASARC/cfitsio/issues/28
-  sed -e 's|/lib/|/|g' -i ${_realname}-${pkgver}/CMakeLists.txt
+  cd "${_realname}-${pkgver}"
+
+  # https://github.com/HEASARC/cfitsio/issues/38
+  patch -Np1 -i "${srcdir}"/001-fix-pkgconf.patch
+
+  # Add static cflag
+  echo "Cflags.private: -DCFITSIO_STATIC_DEFINE" >> ./cfitsio.pc.cmake
 }
 
 build() {
@@ -38,49 +45,44 @@ build() {
     extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
   fi
 
-  if [[ ${CARCH} != aarch64 ]]; then
-    extra_config+=("-DUSE_SSE2=ON")
-  fi
-
   msg "Build static library"
-  mkdir -p "${srcdir}"/static-${MSYSTEM} && cd "${srcdir}/static-${MSYSTEM}"
 
   CFLAGS+=" -D_LARGEFILE_SOURCE=ON -D_FILE_OFFSET_BITS=64" \
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
-    ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"Ninja" \
-    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    ${extra_config[@]} \
-    -DBUILD_SHARED_LIBS=OFF \
-    -DUSE_PTHREADS=ON \
-    ../${_realname}-${pkgver}
+    cmake \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      ${extra_config[@]} \
+      -DBUILD_SHARED_LIBS=OFF \
+      -DUSE_PTHREADS=ON \
+      -DTESTS=OFF \
+      -S "${_realname}-${pkgver}" \
+      -B "static-${MSYSTEM}"
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build "static-${MSYSTEM}"
 
   msg "Build shared library"
-  mkdir -p "${srcdir}"/shared-${MSYSTEM} && cd "${srcdir}/shared-${MSYSTEM}"
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX" \
   CFLAGS+=" -D_LARGEFILE_SOURCE=ON -D_FILE_OFFSET_BITS=64" \
-    ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"Ninja" \
-    -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
-    -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
-    ${extra_config[@]} \
-    -DBUILD_SHARED_LIBS=ON \
-    -DUSE_PTHREADS=ON \
-    -DUTILS=ON \
-    ../${_realname}-${pkgver}
+    cmake \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
+      -DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
+      ${extra_config[@]} \
+      -DBUILD_SHARED_LIBS=ON \
+      -DUSE_PTHREADS=ON \
+      -DTESTS=OFF \
+      -S "${_realname}-${pkgver}" \
+      -B "shared-${MSYSTEM}"
 
-  ${MINGW_PREFIX}/bin/cmake --build .
+  cmake --build "shared-${MSYSTEM}"
 }
 
 package() {
-  cd "${srcdir}/static-${MSYSTEM}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+  DESTDIR="${pkgdir}" cmake --install "static-${MSYSTEM}"
 
-  cd "${srcdir}/shared-${MSYSTEM}"
-  DESTDIR="${pkgdir}" ${MINGW_PREFIX}/bin/cmake --install .
+  DESTDIR="${pkgdir}" cmake --install "shared-${MSYSTEM}"
 
   # Fix cmake files
   local PREFIX_WIN=$(cygpath -am ${MINGW_PREFIX})