diff --git a/pkgbuild/cairo-compmgr-git/PKGBUILD b/pkgbuild/cairo-compmgr-git/PKGBUILD
index 156ce72..22c75fa 100644
--- a/pkgbuild/cairo-compmgr-git/PKGBUILD
+++ b/pkgbuild/cairo-compmgr-git/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=cairo-compmgr-git
 epoch=1
 pkgver=0.3.1.35.g719a997
-pkgrel=2
+pkgrel=3
 pkgdesc="Cairo based composite manager - Git version"
 arch=(i686 x86_64)
 url="http://cairo-compmgr.tuxfamily.org/"
@@ -19,9 +19,11 @@ options=(!makeflags
 
 source=('cairocompmgr::git+https://github.com/gandalfn/Cairo-Composite-Manager.git'
         'https://github.com/gandalfn/Cairo-Composite-Manager/pull/4.diff'
+        'bfd_ansidecl.patch'
 )
 md5sums=('SKIP'
-         '011074cd9687475ebf9ac93fc1f535aa')
+         '011074cd9687475ebf9ac93fc1f535aa'
+         'b316779ffe9f86ada7ed601ae433789b')
 
 pkgver() {
   cd "$srcdir"/cairocompmgr
@@ -37,6 +39,10 @@ prepare() {
 
   #patch needed to build with newer deps version
   patch -p1 < ../4.diff
+
+  #bfd.h should include ansidecl.h
+  patch -p2 < ../bfd_ansidecl.patch
+
 }
 
 build() {
diff --git a/pkgbuild/cairo-compmgr-git/bfd_ansidecl.patch b/pkgbuild/cairo-compmgr-git/bfd_ansidecl.patch
new file mode 100644
index 0000000..17a9028
--- /dev/null
+++ b/pkgbuild/cairo-compmgr-git/bfd_ansidecl.patch
@@ -0,0 +1,14 @@
+diff -Naur src/cairocompmgr/src/ccm-debug.c src/cairocompmgr-patched/src/ccm-debug.c
+--- src/cairocompmgr/src/ccm-debug.c	2014-05-30 14:08:02.434448854 +0200
++++ src/cairocompmgr-patched/src/ccm-debug.c	2014-05-30 14:13:57.447482643 +0200
+@@ -55,8 +55,9 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <execinfo.h>
+-#include <bfd.h>
+ #include <libiberty/libiberty.h>
++#include <libiberty/ansidecl.h>
++#include <bfd.h>
+ #include <dlfcn.h>
+ #include <link.h>
+ #endif /* HAVE_EDEBUG */
diff --git a/pkgbuild/cairo-compmgr/PKGBUILD b/pkgbuild/cairo-compmgr/PKGBUILD
index 2a1fe4e..a6fece2 100644
--- a/pkgbuild/cairo-compmgr/PKGBUILD
+++ b/pkgbuild/cairo-compmgr/PKGBUILD
@@ -9,7 +9,7 @@
 
 pkgname=cairo-compmgr
 pkgver=0.3.1
-pkgrel=7
+pkgrel=8
 epoch=2
 pkgdesc="A Cairo based composite manager"
 arch=(i686 x86_64)
@@ -19,8 +19,13 @@ makedepends=(gettext gtk-doc "intltool>=0.41" git)
 depends=("gtk2>=2.16.0" "vala>=0.24" libsm libgl gconf)
 install=cairo-compmgr.install
 options=(!libtool)
-source=(https://github.com/downloads/gandalfn/Cairo-Composite-Manager/$pkgname-$pkgver.tar.bz2)
-md5sums=('4ef285e0735b1a61b5db2205a2d8f8b3')
+source=(https://github.com/downloads/gandalfn/Cairo-Composite-Manager/$pkgname-$pkgver.tar.bz2
+        'https://github.com/gandalfn/Cairo-Composite-Manager/pull/4.diff'
+        'bfd_ansidecl.patch'
+)
+md5sums=('4ef285e0735b1a61b5db2205a2d8f8b3'
+         '011074cd9687475ebf9ac93fc1f535aa'
+         'b316779ffe9f86ada7ed601ae433789b')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -29,8 +34,11 @@ prepare() {
   sed -i 's!libvala-0.16!libvala-0.24!' configure.ac
   sed -i 's!libvala-0.16!libvala-0.24!' vapi/cairo-compmgr.deps
 
-  #patch for libiberty path bug
-  sed -i 's!<libiberty.h>!<libiberty/libiberty.h>!' src/ccm-debug.c
+  #patch needed to build with newer deps version
+  patch -p1 < ../4.diff
+
+  #bfd.h should include ansidecl.h
+  patch -p2 < ../bfd_ansidecl.patch
 }
 
 build() {
diff --git a/pkgbuild/cairo-compmgr/bfd_ansidecl.patch b/pkgbuild/cairo-compmgr/bfd_ansidecl.patch
new file mode 120000
index 0000000..de8ad8d
--- /dev/null
+++ b/pkgbuild/cairo-compmgr/bfd_ansidecl.patch
@@ -0,0 +1 @@
+../cairo-compmgr-git/bfd_ansidecl.patch
\ No newline at end of file