diff --git a/srcpkgs/libquvi/template b/srcpkgs/libquvi/template
index c683699190d..225e395d334 100644
--- a/srcpkgs/libquvi/template
+++ b/srcpkgs/libquvi/template
@@ -1,8 +1,9 @@
 # Template file for 'libquvi'
 pkgname=libquvi
 version=0.4.1
-revision=3
+revision=4
 build_style=gnu-configure
+configure_args="ac_cv_func_malloc_0_nonnull=yes ac_cv_func_realloc_0_nonnull=yes"
 hostmakedepends="pkg-config"
 makedepends="lua-devel libcurl-devel libquvi-scripts>=0.4.1"
 short_desc="C library that can be used to parse flash media stream URLs"
@@ -23,12 +24,13 @@ long_desc="
   * C API is simple to use"
 
 libquvi-devel_package() {
-	depends="libcurl-devel lua-devel libquvi>=${version}"
-	short_desc="${short_desc} - development files"
+	depends="libcurl-devel lua-devel libquvi>=${version}_${revision}"
+	short_desc+=" - development files"
 	replaces="quvi-devel<0.4.0"
 	pkg_install() {
 		vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 		vmove usr/lib/pkgconfig
 		vmove usr/share
 	}
@@ -38,6 +40,6 @@ libquvi_package() {
 	depends="libquvi-scripts>=${version}"
 	replaces="quvi<0.4.0"
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }