diff --git a/srcpkgs/libdvbpsi/template b/srcpkgs/libdvbpsi/template
index 283793b4f13..b0219ac7cd8 100644
--- a/srcpkgs/libdvbpsi/template
+++ b/srcpkgs/libdvbpsi/template
@@ -11,8 +11,11 @@ distfiles="http://download.videolan.org/pub/libdvbpsi/${version}/${pkgname}-${ve
 checksum=22436366beaa1bff27b3f6d80e43de1012b16d3b63b1e22d37d4a6fcb5db8933
 
 CFLAGS="-Wno-error=cast-qual"
-# gcc6 needs this - disable for now
-# CFLAGS+=" -Wno-error=misleading-indentation"
+_gccver=$(gcc --version|awk '/^gcc \(GCC\)/ { print $3 }')
+if [ "${_gccver%%.*}" -gt 5 ]; then
+	# Disable error for gcc6 warning -Wmisleading-indentation
+	CFLAGS+=" -Wno-error=misleading-indentation"
+}
 
 libdvbpsi-devel_package() {
 	depends="libdvbpsi>=${version}_${revision}"