diff --git a/srcpkgs/chicken/template b/srcpkgs/chicken/template
index 8d38f2e1c7c..fa19376a32a 100644
--- a/srcpkgs/chicken/template
+++ b/srcpkgs/chicken/template
@@ -1,41 +1,45 @@
 # Template file for 'chicken'
 pkgname=chicken
-version=4.7.0
-revision=2
-build_style=gnu-makefile
-make_build_args="PREFIX=/usr PLATFORM=linux"
-make_install_args="PREFIX=/usr PLATFORM=linux"
+version=4.8.0.4
+revision=1
 short_desc="A practical and portable Scheme system"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="BSD"
 homepage="http://www.call-cc.org"
-distfiles="http://code.call-cc.org/releases/$version/$pkgname-$version.tar.gz"
-checksum=56afdbff812febe3f98ae437716ecaa96115732f21db5063ce413e4c7449a26c
+distfiles="http://code.call-cc.org/releases/${version%.*}/$pkgname-$version.tar.gz"
+checksum=cd6c4b05f76a6ac82ff32e8dbd53f7517a283bda32003c6b3baa0c6b24990fb2
 long_desc="
  CHICKEN is a compiler for the Scheme programming language. CHICKEN produces
  portable, efficient C, supports almost all of the R5RS Scheme language
  standard, and includes many enhancements and extensions. CHICKEN runs on
  Linux, MacOS X, Windows, and many Unix flavours."
 
-disable_parallel_build=yes
+# No ARM support??!!!
+only_for_archs="i686 x86_64"
 
-post_install() {
+do_build() {
+	make C_COMPILER_OPTIMIZATION_OPTIONS="$CFLAGS" PREFIX=/usr PLATFORM=linux
+}
+
+do_install() {
+	make PREFIX=/usr DESTDIR=$DESTDIR PLATFORM=linux install
 	vinstall LICENSE 644 usr/share/licenses/${pkgname}
 }
 
 libchicken_package() {
-	short_desc="${short_desc} - runtime library"
+	short_desc+=" - runtime library"
 	pkg_install() {
-		vmove "usr/lib/*.so*"
+		vmove "usr/lib/*.so.*"
 	}
 }
 
 chicken-devel_package() {
 	depends="libchicken>=${version}"
-	short_desc="Chiken development files"
+	short_desc+=" - development files"
 	pkg_install() {
         	vmove usr/include
 		vmove "usr/lib/*.a"
+		vmove "usr/lib/*.so"
 	}
 }