diff --git a/extra/opencv/PKGBUILD b/extra/opencv/PKGBUILD
index 3dd008a58..6beef79bf 100644
--- a/extra/opencv/PKGBUILD
+++ b/extra/opencv/PKGBUILD
@@ -8,7 +8,7 @@
 pkgbase=opencv
 pkgname=(opencv opencv-samples)
 pkgver=4.2.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Open Source Computer Vision Library"
 arch=(x86_64)
 license=(BSD)
@@ -25,10 +25,12 @@ optdepends=('opencv-samples: samples'
 source=("$pkgbase-$pkgver.tar.gz::https://github.com/opencv/opencv/archive/$pkgver.zip"
         "opencv_contrib-$pkgver.tar.gz::https://github.com/opencv/opencv_contrib/archive/$pkgver.tar.gz"
         opencv-includedir.patch
+        opencv-install-samples_utils.patch::"https://github.com/opencv/opencv/commit/981e63d8.patch"
         0001-link-with-libatomic.patch)
 sha256sums=('55bd939079d141a50fca74bde5b61b339dd0f0ece6320ec76859aaff03c90d9f'
             '8a6b5661611d89baa59a26eb7ccf4abb3e55d73f99bb52d8f7c32265c8a43020'
             'a96e35c9592e655b21a62cfe04e864a10e21535ad900e5de67356b9e9f40ca10'
+            'c370f234931d46cd01234d48a01af02642d7e90a0486278fa7845d3bac1c514a'
             '3376bc87ac7404c6f396f1bee03b76ab0e5cb18829f535bbc97cef71d28ab168')
 
 prepare() {
@@ -36,6 +38,7 @@ prepare() {
 
   cd $pkgname-$pkgver
   patch -p1 -i ../opencv-includedir.patch # Fix wrong include patch in pkgconfig file
+  patch -p1 -i ../opencv-install-samples_utils.patch # Install all CMake files required to build samples
 
   sed -e '/ocv_tbb_cmake_guess(HAVE_TBB)/d' -i cmake/OpenCVDetectTBB.cmake # Don't use TBB's cmake config, it breaks build
 
@@ -83,8 +86,7 @@ package_opencv() {
   install -Dm644 "$srcdir"/$pkgname-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname
 
   # separate samples package
-  cd "$pkgdir"/usr/share
-  mv opencv4/samples "$srcdir"/$pkgname-samples
+  mv "$pkgdir"/usr/share/opencv4/samples "$srcdir"
 }
 
 package_opencv-samples() {
@@ -92,10 +94,9 @@ package_opencv-samples() {
   depends=("opencv=$pkgver")
   unset optdepends
 
-  mkdir -p "$pkgdir"/usr/share/opencv
-  cp -r "$srcdir"/opencv-samples "$pkgdir"/usr/share/opencv/samples
-  # fix permissions
-  chmod 755 "$pkgdir"/usr/share/opencv/samples/*
+  cd build
+  mkdir -p "$pkgdir"/usr/share/opencv4
+  mv "$srcdir"/samples "$pkgdir"/usr/share/opencv4
 
   # install license file
   install -Dm644 "$srcdir"/opencv-$pkgver/LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname