diff --git a/common/shlibs b/common/shlibs
index c1f69321462..af5fec2e16e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -2329,3 +2329,6 @@ libax25.so.0 libax25-0.0.12rc4_1
 libax25io.so.0 libax25-0.0.12rc4_1
 libmill.so.12 libmill-1.4_1
 libykneomgr.so.0 libykneomgr-0.1.8_1
+libopenshot-audio.so.3 libopenshot-audio-0.0.6_1
+libopenshot.so.6 libopenshot-0.0.9_1
+libavresample.so.2 libavresample-2.8.5_3
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index ce16e82a614..f42314f0607 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -52,7 +52,7 @@ do_configure() {
 		$(vopt_if x265 '--enable-libx265' '--disable-libx265') \
 		$(vopt_if v4l2 '--enable-libv4l2' '--disable-libv4l2') \
 		$(vopt_enable vaapi) $(vopt_enable vdpau) \
-		--enable-libbs2b
+		--enable-libbs2b --enable-avresample
 }
 do_build() {
 	rm ${XBPS_WRAPPERDIR}/strip
@@ -75,6 +75,12 @@ libavdevice_package() {
 		vmove "usr/lib/libavdevice.so.*"
 	}
 }
+libavresample_package() {
+	short_desc="FFmpeg audio resampling library"
+	pkg_install() {
+		vmove "usr/lib/libavresample.so.*"
+	}
+}
 libavformat_package() {
 	short_desc="FFmpeg file format library"
 	pkg_install() {
@@ -120,7 +126,8 @@ ffmpeg-devel_package() {
 		libavfilter>=${version}_${revision}
 		libpostproc>=${version}_${revision}
 		libswscale>=${version}_${revision}
-		libswresample>=${version}_${revision}"
+		libswresample>=${version}_${revision}
+		libavresample>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
new file mode 120000
index 00000000000..a9f1eea092d
--- /dev/null
+++ b/srcpkgs/libavresample
@@ -0,0 +1 @@
+ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/libopenshot-audio-devel b/srcpkgs/libopenshot-audio-devel
new file mode 120000
index 00000000000..9574f3d5bbe
--- /dev/null
+++ b/srcpkgs/libopenshot-audio-devel
@@ -0,0 +1 @@
+libopenshot-audio
\ No newline at end of file
diff --git a/srcpkgs/libopenshot-audio/template b/srcpkgs/libopenshot-audio/template
new file mode 100644
index 00000000000..088b246c222
--- /dev/null
+++ b/srcpkgs/libopenshot-audio/template
@@ -0,0 +1,24 @@
+# Template file for 'libopenshot-audio'
+pkgname=libopenshot-audio
+version=0.0.6
+revision=1
+build_style=cmake
+only_for_archs="x86_64 i686"
+hostmakedepends="cmake doxygen"
+makedepends="xorg-server-devel libXrandr-devel libXinerama-devel libXcursor-devel alsa-lib-devel"
+short_desc="OpenShot audio library"
+maintainer="Spencer Hill <spencernh77@gmail.com>"
+license="GPL-3"
+homepage="www.openshot.org"
+distfiles="https://launchpad.net/libopenshot/0.0/0.0.9/+download/${pkgname}-${version}.tar.gz"
+checksum=29707bf7603fc08b2a152abff2599405f3499a2d674919b1a1749638cd91f42e
+create_wrksrc=yes
+
+libopenshot-audio-devel_package() {
+	short_desc+=" - development files"
+	depends+=" ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove "usr/lib/*.so"
+	}
+}
diff --git a/srcpkgs/libopenshot-devel b/srcpkgs/libopenshot-devel
new file mode 120000
index 00000000000..d7563c207d9
--- /dev/null
+++ b/srcpkgs/libopenshot-devel
@@ -0,0 +1 @@
+libopenshot
\ No newline at end of file
diff --git a/srcpkgs/libopenshot/template b/srcpkgs/libopenshot/template
new file mode 100644
index 00000000000..86816e3ba5e
--- /dev/null
+++ b/srcpkgs/libopenshot/template
@@ -0,0 +1,24 @@
+# Template file for 'libopenshot'
+pkgname=libopenshot
+version=0.0.9
+revision=1
+build_style=cmake
+only_for_archs="i686 x86_64"
+hostmakedepends="cmake swig doxygen ruby python3"
+makedepends="python3.4-devel ffmpeg-devel libmagick-devel qt5-devel libgomp-devel libopenshot-audio-devel qt5-multimedia-devel
+ffmpeg libswresample ruby-devel x264-devel unittest-cpp libavresample"
+depends="python3"
+short_desc="Library files for the OpenShot video editor"
+maintainer="Spencer Hill <spencernh77@gmail.com>"
+license="GPL-3"
+homepage="www.openshot.org"
+distfiles="https://launchpad.net/${pkgname}/0.0/${version}/+download/${pkgname}-${version}.tar.gz"
+checksum=8ff9779a19f576f3c30fb2114d7e4741200bd6e6b79a81787eabde262be6c19c
+create_wrksrc=yes
+
+libopenshot-devel_package() {
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+	}
+}
diff --git a/srcpkgs/openshot/template b/srcpkgs/openshot/template
new file mode 100644
index 00000000000..ea3f28ed6af
--- /dev/null
+++ b/srcpkgs/openshot/template
@@ -0,0 +1,17 @@
+# Template file for 'openshot'
+pkgname=openshot
+version=2.0.5
+revision=1
+build_style=python-module
+python_versions="3.4"
+only_for_archs="i686 x86_64"
+hostmakedepends="python3"
+makedepends="python3.4-PyQt5 ffmpeg-devel python3.4-setuptools"
+depends="python3.4 python3.4-PyQt5 python3.4-PyQt5-webkit libopenshot"
+short_desc="An open-source, non-linear video editor for Linux"
+maintainer="Spencer Hill <spencernh77@gmail.com>"
+license="GPL-3"
+homepage="www.openshot.org"
+distfiles="https://launchpad.net/${pkgname}/2.0/${version}/+download/${pkgname}-qt-${version}.tar.gz"
+checksum=e934000aa2958b88b60e642699ee382e4624b1ad536f33d5154ea5acfc472fa0
+wrksrc=${pkgname}-qt-${version}
diff --git a/srcpkgs/unittest-cpp/template b/srcpkgs/unittest-cpp/template
new file mode 100644
index 00000000000..5e6fc2fc78b
--- /dev/null
+++ b/srcpkgs/unittest-cpp/template
@@ -0,0 +1,23 @@
+# Template file for 'unittest-cpp'
+pkgname=unittest-cpp
+version=1.5.0
+revision=1
+build_style=cmake
+hostmakedepends="cmake"
+short_desc="A lightweight unit testing framework for C++"
+maintainer="Spencer Hill <spencernh77@gmail.com>"
+license="MIT"
+homepage="https://github.com/unittest-cpp/unittest-cpp"
+distfiles="https://github.com/unittest-cpp/unittest-cpp/archive/v1.5.0.tar.gz"
+checksum=09426598ee0976f9c908f8ea7282bda7e9f088305a1fe27d674b7c65b8f53379
+
+pre_build() {
+	case $XBPS_TARGET_MACHINE in
+		arm* )  echo "Removing built in test from arm build. Won't run on host x86_64 machine"
+				sed -i '59,61d' CMakeLists.txt ;;
+	esac
+}
+
+post_install() {
+	vlicense LICENSE
+}