diff --git a/windows-default-manifest/PKGBUILD b/windows-default-manifest/PKGBUILD
index 61dca610a39..9a486caf272 100644
--- a/windows-default-manifest/PKGBUILD
+++ b/windows-default-manifest/PKGBUILD
@@ -7,24 +7,15 @@ pkgdesc='Default Windows application manifest'
 url='https://cygwin.com/'
 arch=('i686' 'x86_64')
 license=('BSD')
-makedepends=('cvs' 'gcc')
-source=(001-msysize.patch)
-sha256sums=('0baef1e5f9b980cdf730386a652b6b02ba6b675cc120ad67c7c15e6a88050e0f')
-CVSROOT=":pserver:anoncvs:@sourceware.org:/cvs/cygwin-apps"
-CVSMOD="windows-default-manifest"
-CVS_BRANCH="release-${pkgver//\./_}"
+makedepends=('git' 'gcc')
+_GIT_TAG="release-${pkgver//\./_}"
+source=("git://sourceware.org/git/cygwin-apps/${pkgname}.git#tag=${_GIT_TAG}"
+        001-msysize.patch)
+sha256sums=('SKIP'
+            '0baef1e5f9b980cdf730386a652b6b02ba6b675cc120ad67c7c15e6a88050e0f')
 
 prepare() {
-  cd ${srcdir}
-  msg "Connecting to sourceware.org CVS server...."
-  if [ -d $CVSMOD/CVS ]; then
-    cd $CVSMOD
-    cvs -z3 update -d
-  else
-    cvs -z3 -d $CVSROOT co -r $CVS_BRANCH -f $CVSMOD
-    cd $CVSMOD
-  fi
-
+  cd "${pkgname}"
   patch -p1 -i ${srcdir}/001-msysize.patch
   autoreconf -fiv
 }