diff --git a/srcpkgs/cdparanoia/template b/srcpkgs/cdparanoia/template
index f689be3e78..2ea6e49af0 100644
--- a/srcpkgs/cdparanoia/template
+++ b/srcpkgs/cdparanoia/template
@@ -1,7 +1,7 @@
 # Template file for 'cdparanoia'.
 pkgname=cdparanoia
 version=10.2
-revision=11
+revision=12
 wrksrc="${pkgname}-III-${version}"
 hostmakedepends="libtool automake"
 build_style=gnu-configure
@@ -12,9 +12,27 @@ maintainer="Juan RP <xtraeme@voidlinux.eu>"
 distfiles="http://downloads.xiph.org/releases/$pkgname/$pkgname-III-$version.src.tgz"
 checksum=005db45ef4ee017f5c32ec124f913a0546e77014266c6a1c50df902a55fe64df
 
-CFLAGS="-fPIC -Du_int16_t=uint16_t -Du_int32_t=uint32_t"
+CFLAGS="-Du_int16_t=uint16_t -Du_int32_t=uint32_t"
 disable_parallel_build=yes
 
+if [ -n "$CROSS_BUILD" ]; then
+	configure_args+=" ac_cv_have_stdint_h=yes"
+	configure_args+=" ac_cv_type_short=yes ac_cv_sizeof_short=2"
+	configure_args+=" ac_cv_type_int=yes ac_cv_sizeof_int=4"
+	configure_args+=" ac_cv_type_long=yes"
+	configure_args+=" ac_cv_type_long_long=yes ac_cv_sizeof_long_long=8"
+	configure_args+=" ac_cv_type_int16_t=yes ac_cv_sizeof_int16_t=2"
+	configure_args+=" ac_cv_type_int32_t=yes ac_cv_sizeof_int32_t=4"
+	case "$XBPS_TARGET_MACHINE" in
+		arm*|mips*|i686*) # 32 bit architectures
+			configure_args+=" ac_cv_sizeof_long=4"
+			;;
+		*)
+			configure_args+=" ac_cv_sizeof_long=8"
+			;;
+	esac
+fi
+
 pre_configure() {
 	autoreconf -i
 }