diff --git a/srcpkgs/gmp/gmp-devel.template b/srcpkgs/gmp/gmp-devel.template
index 8a78c153d0..552df380e2 100644
--- a/srcpkgs/gmp/gmp-devel.template
+++ b/srcpkgs/gmp/gmp-devel.template
@@ -8,11 +8,8 @@ long_desc="${long_desc}
 Add_dependency run glibc-devel
 Add_dependency run gmp
 
-do_install()
-{
-	mkdir -p ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr
-	mv ${SRCPKGDESTDIR}/usr/lib/*.a ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/lib/*.so ${DESTDIR}/usr/lib
-	mv ${SRCPKGDESTDIR}/usr/share ${DESTDIR}/usr
+do_install() {
+	vmove usr/include usr
+	vmove "usr/lib/*.a" usr/lib
+	vmove usr/share usr
 }
diff --git a/srcpkgs/gmp/template b/srcpkgs/gmp/template
index dba5aa2af1..635f2eb839 100644
--- a/srcpkgs/gmp/template
+++ b/srcpkgs/gmp/template
@@ -1,6 +1,6 @@
 # Template build file for 'gmp'
 pkgname=gmp
-version=5.0.3
+version=5.0.4
 homepage="http://gmplib.org/"
 distfiles="${GNU_SITE}/gmp/gmp-${version}.tar.bz2"
 build_style=gnu-configure
@@ -14,7 +14,7 @@ configure_args="${configure_args} --enable-cxx --enable-mpbsd
 short_desc="Library for arbitrary precision arithmetic"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="LGPL-3"
-checksum=dcafe9989c7f332b373e1f766af8e9cd790fc802fdec422a1910a6ef783480e3
+checksum=35d4aade3e4bdf0915c944599b10d23f108ffedf6c3188aeec52221c5cf9a06f
 long_desc="
  GNU MP is a library for arbitrary precision arithmetic, operating on signed
  integers, rational numbers, and floating point numbers.  It has a rich set