diff --git a/srcpkgs/openexr/template b/srcpkgs/openexr/template
index a44fdfe8ee1..3f1b59753c1 100644
--- a/srcpkgs/openexr/template
+++ b/srcpkgs/openexr/template
@@ -1,7 +1,7 @@
 # Template file for 'openexr'
 pkgname=openexr
 version=2.4.1
-revision=1
+revision=2
 build_style=cmake
 build_helper="qemu"
 hostmakedepends="pkg-config"
@@ -27,13 +27,10 @@ post_install() {
 
 	vlicense LICENSE.md
 
-	# Remove files which are already in ilmbase
-	for d in usr/include/OpenEXR usr/lib/cmake/IlmBase usr/lib/pkgconfig usr/lib; do
-		for f in ${XBPS_CROSS_BASE}/$d/*; do
-			f="${f##*/}"
-			if [ -f "${DESTDIR}/$d/$f" ]; then
-				rm -v "${DESTDIR}/$d/$f"
-			fi
+	# Remove files which are already in ilmbase{,-devel}
+	for pkg in ilmbase ilmbase-devel; do
+		for f in $(xbps-query -Rf $pkg|awk '{print $1}'); do
+			rm -f "${DESTDIR}/$f"
 		done
 	done
 }