diff --git a/common/shlibs b/common/shlibs
index 1508fed7ede..557a236e4fa 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -1879,22 +1879,23 @@ libcapstone.so.3 capstone-3.0_1
 libhavege.so.1 libhaveged-1.9.1_1
 libnih.so.1 libnih-1.0.3_1
 libnih-dbus.so.1 libnih-1.0.3_1
-libopencv_videostab.so.3.2 libopencv-3.2.0_1
-libopencv_flann.so.3.2 libopencv-3.2.0_1
-libopencv_features2d.so.3.2 libopencv-3.2.0_1
-libopencv_ml.so.3.2 libopencv-3.2.0_1
-libopencv_highgui.so.3.2 libopencv-3.2.0_1
-libopencv_imgproc.so.3.2 libopencv-3.2.0_1
-libopencv_objdetect.so.3.2 libopencv-3.2.0_1
-libopencv_superres.so.3.2 libopencv-3.2.0_1
-libopencv_core.so.3.2 libopencv-3.2.0_1
-libopencv_video.so.3.2 libopencv-3.2.0_1
-libopencv_calib3d.so.3.2 libopencv-3.2.0_1
-libopencv_stitching.so.3.2 libopencv-3.2.0_1
-libopencv_photo.so.3.2 libopencv-3.2.0_1
-libopencv_imgcodecs.so.3.2 libopencv-3.2.0_1
-libopencv_shape.so.3.2 libopencv-3.2.0_1
-libopencv_videoio.so.3.2 libopencv-3.2.0_1
+libopencv_ml.so.3.3 libopencv-3.3.0_1
+libopencv_objdetect.so.3.3 libopencv-3.3.0_1
+libopencv_dnn.so.3.3 libopencv-3.3.0_1
+libopencv_shape.so.3.3 libopencv-3.3.0_1
+libopencv_stitching.so.3.3 libopencv-3.3.0_1
+libopencv_photo.so.3.3 libopencv-3.3.0_1
+libopencv_video.so.3.3 libopencv-3.3.0_1
+libopencv_calib3d.so.3.3 libopencv-3.3.0_1
+libopencv_features2d.so.3.3 libopencv-3.3.0_1
+libopencv_flann.so.3.3 libopencv-3.3.0_1
+libopencv_highgui.so.3.3 libopencv-3.3.0_1
+libopencv_videoio.so.3.3 libopencv-3.3.0_1
+libopencv_imgcodecs.so.3.3 libopencv-3.3.0_1
+libopencv_imgproc.so.3.3 libopencv-3.3.0_1
+libopencv_core.so.3.3 libopencv-3.3.0_1
+libopencv_superres.so.3.3 libopencv-3.3.0_1
+libopencv_videostab.so.3.3 libopencv-3.3.0_1
 libcgmanager.so.0 libcgmanager-0.33_1
 libuniconf.so.4.6 wvstreams-4.6.1_2
 libwvbase.so.4.6 wvstreams-4.6.1_1
diff --git a/srcpkgs/libopencv-python3/template b/srcpkgs/libopencv-python3/template
new file mode 120000
index 00000000000..3f0b7436493
--- /dev/null
+++ b/srcpkgs/libopencv-python3/template
@@ -0,0 +1 @@
+../opencv/template
\ No newline at end of file
diff --git a/srcpkgs/opencv/template b/srcpkgs/opencv/template
index 67daf07605b..d98788c90a9 100644
--- a/srcpkgs/opencv/template
+++ b/srcpkgs/opencv/template
@@ -1,27 +1,20 @@
 # Template file for 'opencv'
 pkgname=opencv
-version=3.2.0
-revision=3
+version=3.3.0
+revision=1
 build_style=cmake
-configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON -WITH_OPENCL=ON"
-hostmakedepends="pkg-config python-devel eigen"
-makedepends="python-numpy ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
- jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+-devel gtk+3-devel
+configure_args="-DENABLE_PRECOMPILED_HEADERS=OFF -DWITH_OPENMP=ON
+ -DWITH_OPENCL=ON -DENABLE_CXX11=ON"
+hostmakedepends="pkg-config eigen"
+makedepends="ffmpeg-devel libpng-devel libjpeg-turbo-devel tiff-devel
+ jasper-devel ocl-icd-devel libgomp-devel libopenexr-devel gtk+3-devel
  libgphoto2-devel gst-plugins-base1-devel openblas-devel"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://opencv.org"
 license="BSD"
 short_desc="Computer vision and machine learning software library"
-distfiles="https://github.com/Itseez/${pkgname}/archive/${version}.tar.gz"
-checksum=b9d62dfffb8130d59d587627703d5f3e6252dce4a94c1955784998da7a39dd35
-nocross=yes
-
-pre_configure() {
-	case "$XBPS_TARGET_MACHINE" in
-		*-musl)
-			sed -i 's|PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP|PTHREAD_MUTEX_INITIALIZER|g' modules/core/src/parallel_pthreads.cpp;;
-	esac
-}
+distfiles="https://github.com/opencv/${pkgname}/archive/${version}.tar.gz"
+checksum=95029eb5578af3b20b8c7f8f6f59db1b827c2d5aaaa74b6becb1de647cbdda5a
 
 post_install() {
 	vlicense LICENSE
@@ -45,9 +38,26 @@ libopencv-devel_package() {
 	}
 }
 
-libopencv-python_package() {
-	short_desc+=" - Python bindings"
-	pkg_install() {
-		vmove usr/lib/python2.7
+if [ -z "$CROSS_BUILD" ]; then
+	# because python-numpy cannot be cross compiled
+
+	hostmakedepends+=" python-devel python3-devel"
+	makedepends+=" python-numpy python3-numpy"
+
+	libopencv-python_package() {
+		short_desc+=" - Python bindings"
+		pkg_install() {
+			mkdir -p ${DESTDIR}/usr/lib/python2.7
+			vmove usr/lib/python2.7
+		}
 	}
-}
+
+	libopencv-python3_package() {
+		short_desc+=" - Python3 bindings"
+		pkg_install() {
+			mkdir -p ${DESTDIR}/usr/lib/python3.5
+			vmove usr/lib/python3.5
+		}
+	}
+fi
+