diff --git a/srcpkgs/gcc/template b/srcpkgs/gcc/template
index f81132eaea..bf27aaa0c7 100644
--- a/srcpkgs/gcc/template
+++ b/srcpkgs/gcc/template
@@ -2,7 +2,7 @@
 pkgname=gcc
 _majorver=4.9
 version=${_majorver}.0
-revision=1
+revision=2
 short_desc="The GNU C Compiler"
 maintainer="Juan RP <xtraeme@gmail.com>"
 homepage="http://gcc.gnu.org"
@@ -233,6 +233,19 @@ gcc-objc_package() {
 	}
 }
 
+libcilkrts-devel_package() {
+	depends="libcilkrts>=${_majorver}"
+	short_desc+=" - Intel(R) Cilk(TM) Plus runtime library  - development files"
+	pkg_install() {
+		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/cilk
+		vmove "usr/lib/gcc/${_triplet}/${_majorver}/plugin/include/cilk*"
+		vmove usr/lib/libcilktrs.so
+		vmove usr/lib/libcilktrs.a
+		vmove usr/lib/libcilktrs.spec
+		touch ${PKGDESTDIR}/usr/share/info/dir
+	}
+}
+
 libcilkrts_package() {
 	short_desc+=" - Intel(R) Cilk(TM) Plus runtime library"
 	pkg_install() {
@@ -388,7 +401,10 @@ libgomp-devel_package() {
 	depends="libgomp>=${_majorver}"
 	short_desc+=" - OpenMP v4.0 library - development files"
 	pkg_install() {
+		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/omp.h
+		vmove usr/lib/libgomp.so
 		vmove usr/lib/libgomp.a
+		vmove usr/lib/libgomp.spec
 		vmove usr/share/info/libgomp.info
 		touch ${PKGDESTDIR}/usr/share/info/dir
 	}
@@ -398,9 +414,7 @@ libgomp_package() {
 	short_desc+=" - OpenMP v4.0 library"
 	replaces="gcc>=4.6.3<4.6.3_3"
 	pkg_install() {
-		vmove usr/lib/gcc/${_triplet}/${_majorver}/include/omp.h
-		vmove "usr/lib/libgomp*.so*"
-		vmove usr/lib/libgomp.spec
+		vmove "usr/lib/libgomp*.so.*"
 		vinstall ${wrksrc}/COPYING.RUNTIME 644 usr/share/licenses/$pkgname RUNTIME.LIBRARY.EXCEPTION
 	}
 }