diff --git a/mingw-w64-libgphoto2/PKGBUILD b/mingw-w64-libgphoto2/PKGBUILD
index 1ce6612c29..0ef5051386 100644
--- a/mingw-w64-libgphoto2/PKGBUILD
+++ b/mingw-w64-libgphoto2/PKGBUILD
@@ -15,20 +15,19 @@ depends=("${MINGW_PACKAGE_PREFIX}-libsystre"
          "${MINGW_PACKAGE_PREFIX}-libgd"
          "${MINGW_PACKAGE_PREFIX}-libexif"
          "${MINGW_PACKAGE_PREFIX}-libusb")
-makedepends=(
-  "${MINGW_PACKAGE_PREFIX}-gcc"
-  "${MINGW_PACKAGE_PREFIX}-libtool"
-)
-source=(https://sourceforge.net/projects/gphoto/files/libgphoto/${pkgver}/${_realname}-${pkgver}.tar.gz
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
+             "${MINGW_PACKAGE_PREFIX}-libtool")
+source=(#https://sourceforge.net/projects/gphoto/files/libgphoto/${pkgver}/${_realname}-${pkgver}.tar.gz{,.asc}
+        ${_realname}-${pkgver}.tar.gz::https://github.com/gphoto/libgphoto2/archive/${_realname}-${pkgver//./_}-release.tar.gz
         libgphoto2-gp_system_filename-fix.patch
-libgphoto2-use-pkg-config-for-gd.patch) 
-sha256sums=('50afdb74016ef26bf8d3d87e708dc6ffe9bd76697eff417e3dd575e7d8558022'
+        libgphoto2-use-pkg-config-for-gd.patch) 
+sha256sums=('82118e8abaf54100c6be1d41489f9a26d951c7a6194db6f11efa60274a6f53a7'
             '27c558cdf88bee6ce1f3f564d6dfbc0b78809c33b98d20c9e58e40e335d7b0dd'
             '16036711f9c656e3988bc3c7b3e5209db3ad1163048cc7a0139e3e882d52f7c2')
 validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner 
 
 prepare() {
-  cd "${srcdir}/${_realname}-${pkgver}"
+  cd "${srcdir}/${_realname}-${_realname}-${pkgver//./_}-release"
   patch -Np1 -i "${srcdir}/libgphoto2-gp_system_filename-fix.patch"
   patch -Np1 -i "${srcdir}/libgphoto2-use-pkg-config-for-gd.patch"
   autoreconf -fiv
@@ -37,7 +36,7 @@ prepare() {
 build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
-  ../${_realname}-${pkgver}/configure \
+  ../${_realname}-${_realname}-${pkgver//./_}-release/configure \
     --prefix="${MINGW_PREFIX}"      \
     --build=${MINGW_CHOST}          \
     --host=${MINGW_CHOST}           \