diff --git a/Makefile.in b/Makefile.in
index f6e7a25..7aeabc4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -430,7 +430,7 @@ install-windows-dev: \
 		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/def
 
 	@$(INSTALL_DATA) \
-		CHANGELOG \
+		$(srcdir)/CHANGELOG \
 		$(DESTDIR)$(datarootdir)/$(PRODUCT_NAME)/$(PACKAGE_NAME).changes
 
 	@rm -f $(DESTDIR)$(libdir)/$(LIBNAME)@DLLEXT@
diff --git a/win/PKGBUILD b/win/PKGBUILD
index a00c1dc..bf5bf13 100644
--- a/win/PKGBUILD
+++ b/win/PKGBUILD
@@ -27,12 +27,13 @@ conflicts=($pkgname)
 
 prepare() {
   cd ${srcdir}/${_realname}
-  NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
-  cd ${srcdir}/${_realname}
-  ./configure \
+  rm -fr "${srcdir}/build-${CARCH}"
+  mkdir -p "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${CARCH}"
+  ${srcdir}/${_realname}/autogen.sh \
     --prefix=${MINGW_PREFIX} \
     --build=${MINGW_CHOST} \
     --host=${MINGW_CHOST} \
@@ -42,7 +43,7 @@ build() {
 }
 
 package() {
-  cd ${srcdir}/${_realname}
+  cd "${srcdir}/build-${CARCH}"
   make DESTDIR="${pkgdir}" install
   install -Dm644 "${srcdir}/${_realname}/LICENSE" "${pkgdir}${MINGW_PREFIX}/share/licenses/${_realname}/LICENSE"
 }
--
libgit2 0.21.2