diff --git a/srcpkgs/orc/template b/srcpkgs/orc/template
index 8be58b342b6..c31a5fb4e9c 100644
--- a/srcpkgs/orc/template
+++ b/srcpkgs/orc/template
@@ -1,29 +1,25 @@
 # Template build file for 'orc'.
 pkgname=orc
-version=0.4.17
+version=0.4.18
 revision=1
 build_style=gnu-configure
 configure_args="--disable-static"
-hostmakedepends="pkg-config"
+hostmakedepends="pkg-config libtool"
 short_desc="The Oild Runtime Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://code.entropywave.com/orc/"
 license="Simplified BSD, New BSD license"
 distfiles="http://code.entropywave.com/download/orc/orc-${version}.tar.gz"
-checksum=4fc7cca48c59fff23afee78fb642cdbde001f56401c8f47b95a16578d1d5d7e8
+checksum=34d3c8a7259f42bed4dcfbc106c5e3d0cc8e17eeaa73128d1c5eaf92883a6a24
 long_desc="
  Orc is a library and set of tools for compiling and executing very simple
  programs that operate on arrays of data.  The “language” is a generic assembly
  language that represents many of the features available in SIMD architectures,
  including saturated addition and subtraction, and many arithmetic operations."
 
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" automake libtool"
-	pre_configure() {
-		sed -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,g' -i configure.ac
-		autoreconf -fi
-	}
-fi
+pre_configure() {
+	libtoolize -f
+}
 
 post_install() {
 	vinstall COPYING 644 usr/share/licenses/orc
@@ -35,12 +31,13 @@ orc-devel_package() {
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
 		vmove usr/share/gtk-doc
 	}
 }
 
 orc_package() {
 	pkg_install() {
-		vmove usr
+		vmove all
 	}
 }