diff --git a/mingw-w64-libjpeg-turbo/PKGBUILD b/mingw-w64-libjpeg-turbo/PKGBUILD
index 643e2457cd..b60b8fa48c 100644
--- a/mingw-w64-libjpeg-turbo/PKGBUILD
+++ b/mingw-w64-libjpeg-turbo/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libjpeg-turbo
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="JPEG image codec with accelerated baseline compression and decompression (mingw-w64)"
 arch=('any')
 url="http://libjpeg-turbo.virtualgl.org"
@@ -36,23 +36,24 @@ prepare() {
 }
 
 build() {
-  export CFLAGS+=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
-  export CXXFLAGS+=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
-  mkdir -p "${srcdir}/build-${CARCH}"
-  cd "${srcdir}/build-${CARCH}"
-  "${srcdir}"/${_realname}-${pkgver}/configure \
-      --prefix=${MINGW_PREFIX} \
-      --build=${MINGW_CHOST} \
-      --host=${MINGW_CHOST} \
-	  --target=${MINGW_CHOST} \
-	  --with-jpeg8 \
-	  --mandir=${MINGW_PREFIX}/share/man
-  make
+	export CFLAGS+=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+	export CXXFLAGS+=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4"
+	mkdir -p "${srcdir}/build-${CARCH}"
+	cd "${srcdir}/build-${CARCH}"
+	"${srcdir}"/${_realname}-${pkgver}/configure \
+		--prefix=${MINGW_PREFIX} \
+		--build=${MINGW_CHOST} \
+		--host=${MINGW_CHOST} \
+		--target=${MINGW_CHOST} \
+		--with-jpeg8 \
+		--mandir=${MINGW_PREFIX}/share/man
+	make
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
-  make DESTDIR="$pkgdir" install
-  find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
-  #rm -rf "${pkgdir}${MINGW_PREFIX}/"{doc,share}
+	cd "${srcdir}/build-${CARCH}"
+	make DESTDIR="$pkgdir" install
+	find "${pkgdir}${MINGW_PREFIX}" -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
+	#rm -rf "${pkgdir}${MINGW_PREFIX}/"{doc,share}
+	cp "${srcdir}"/${_realname}-${pkgver}/{jinclude,transupp}.h ${pkgdir}${MINGW_PREFIX}/include/
 }
diff --git a/mingw-w64-libtiff/PKGBUILD b/mingw-w64-libtiff/PKGBUILD
index 75cbfbbf72..416a984b18 100644
--- a/mingw-w64-libtiff/PKGBUILD
+++ b/mingw-w64-libtiff/PKGBUILD
@@ -4,38 +4,38 @@ _realname=libtiff
 _mingw_suff=mingw-w64-${CARCH}
 pkgname="${_mingw_suff}-${_realname}"
 pkgver=4.0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Library for manipulation of TIFF images (mingw-w64)"
 arch=('any')
 url="http://www.remotesensing.org/libtiff"
 license=("custom")
-depends=("${_mingw_suff}-winpthreads" "${_mingw_suff}-libjpeg-turbo" "${_mingw_suff}-zlib")
+depends=("${_mingw_suff}-gcc-libs" "${_mingw_suff}-libjpeg-turbo" "${_mingw_suff}-zlib")
 makedepends=("${_mingw_suff}-gcc")
 options=('staticlibs' 'strip')
 source=("ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz")
 md5sums=('051c1068e6a0627f461948c365290410')
 
 build() {
-  cd "${srcdir}/tiff-${pkgver}"
-  export CFLAGS+=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-strict-aliasing"
-  export CXXFLAGS+=" -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -fno-strict-aliasing"
+	cd "${srcdir}/tiff-${pkgver}"
+	export CFLAGS+=" -fno-strict-aliasing"
+	export CXXFLAGS+=" -fno-strict-aliasing"
 
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
-  ../tiff-${pkgver}/configure \
-      --prefix=${MINGW_PREFIX} \
-      --build=${MINGW_CHOST} \
-      --host=${MINGW_CHOST} \
-	  --target=${MINGW_CHOST} \
-      --enable-static \
-      --enable-shared
-  make
+	mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+	../tiff-${pkgver}/configure \
+		--prefix=${MINGW_PREFIX} \
+		--build=${MINGW_CHOST} \
+		--host=${MINGW_CHOST} \
+		--target=${MINGW_CHOST} \
+		--enable-static \
+		--enable-shared
+	make
 }
 
 package() {
-  cd "${srcdir}/build-${CARCH}"
-  make DESTDIR="${pkgdir}" install
-  #find "${pkgdir}${MINGW_PREFIX}" -name '*.exe' -o -name '*.bat' -o -name '*.def' -o -name '*.exp' | xargs -rtl1 rm
-  #find "${pkgdir}${MINGW_PREFIX}" -name '*.dll' | xargs -rtl1 strip --strip-unneeded
-  #find "${pkgdir}${MINGW_PREFIX}" -name '*.a' -o -name '*.dll' | xargs -rtl1 strip -g
-  rm -rf "${pkgdir}${MINGW_PREFIX}/share"
+	cd "${srcdir}/build-${CARCH}"
+	make DESTDIR="${pkgdir}" install
+
+	#rm -rf "${pkgdir}${MINGW_PREFIX}/share"
+	cp ${srcdir}/tiff-${pkgver}/libtiff/{tiffiop,tif_dir}.h ${pkgdir}${MINGW_PREFIX}/include/
+	cp libtiff/tif_config.h ${pkgdir}${MINGW_PREFIX}/include/
 }