diff --git a/srcpkgs/oprofile/oprofile-qt4-gui.rshlibs b/srcpkgs/oprofile/oprofile-qt4-gui.rshlibs
index 760c41632c2..b801dfe350c 100644
--- a/srcpkgs/oprofile/oprofile-qt4-gui.rshlibs
+++ b/srcpkgs/oprofile/oprofile-qt4-gui.rshlibs
@@ -1,7 +1,6 @@
 libQt3Support.so.4
 libQtGui.so.4
 libQtCore.so.4
-libbfd-2.22.so
 libstdc++.so.6
 libgcc_s.so.1
 libc.so.6
diff --git a/srcpkgs/oprofile/oprofile-qt4-gui.template b/srcpkgs/oprofile/oprofile-qt4-gui.template
index ac86af93d1a..4780586d179 100644
--- a/srcpkgs/oprofile/oprofile-qt4-gui.template
+++ b/srcpkgs/oprofile/oprofile-qt4-gui.template
@@ -1,13 +1,11 @@
 # Template file for 'oprofile-qt4-gui'.
 #
-depends="oprofile>=0.9.7"
+depends="oprofile>=$version"
 short_desc="Qt GUI for oprofile"
 long_desc="${long_desc}
 
  This package contains oprof_start, a Qt4 GUI for oprofile."
 
-
-do_install()
-{
+do_install() {
 	vmove usr/bin/oprof_start usr/bin
 }
diff --git a/srcpkgs/oprofile/oprofile.rshlibs b/srcpkgs/oprofile/oprofile.rshlibs
index b0fa6abd1a8..1e1739d1e2a 100644
--- a/srcpkgs/oprofile/oprofile.rshlibs
+++ b/srcpkgs/oprofile/oprofile.rshlibs
@@ -1,6 +1,6 @@
-libbfd-2.22.so
 libdl.so.2
 libc.so.6
 libpopt.so.0
 libstdc++.so.6
 libgcc_s.so.1
+libz.so.1
diff --git a/srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch b/srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch
new file mode 100644
index 00000000000..eac62d61ef5
--- /dev/null
+++ b/srcpkgs/oprofile/patches/bfd-header-needs-sys-types.patch
@@ -0,0 +1,10 @@
+--- opjitconv/opjitconv.h.orig	2012-06-12 14:40:00.546999021 +0200
++++ opjitconv/opjitconv.h	2012-06-12 14:40:09.482781715 +0200
+@@ -26,6 +26,7 @@
+ #define OP_JIT_CONV_ALREADY_DONE 5
+ #define OP_JIT_CONV_TMPDIR_NOT_REMOVED 6
+ 
++#include <sys/types.h>
+ #include <bfd.h>
+ #include <stddef.h>
+ #include <sys/stat.h>
diff --git a/srcpkgs/oprofile/template b/srcpkgs/oprofile/template
index 8d82cb773c1..d6ef6cd7522 100644
--- a/srcpkgs/oprofile/template
+++ b/srcpkgs/oprofile/template
@@ -5,8 +5,12 @@ revision=3
 homepage="http://oprofile.sourceforge.net"
 distfiles="${SOURCEFORGE_SITE}/$pkgname/$pkgname-$version.tar.gz"
 build_style=gnu-configure
-configure_args="--with-kernel-support --with-x --enable-gui=qt4"
-makedepends="qt-devel zlib-devel popt-devel binutils-devel"
+configure_args="--with-kernel-support --with-x --enable-gui=qt4 --disable-static"
+makedepends="popt-devel binutils-devel>=2.22.52.0.4_2 pkg-config libX11-devel icu-devel qt-devel"
+subpackages="$pkgname-qt4-gui"
+system_accounts="oprofile"
+oprofile_homedir="/var/lib/oprofile"
+make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
 short_desc="Transparent low-overhead system-wide profiler for Linux"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
@@ -20,9 +24,3 @@ long_desc="
  for basic time-spent profiling. All code is profiled: hardware and software
  interrupt handlers, kernel modules, the kernel, shared libraries, and
  applications."
-
-subpackages="$pkgname-qt4-gui"
-system_accounts="oprofile"
-oprofile_homedir="/var/lib/oprofile"
-make_dirs="/var/lib/oprofile 0750 oprofile oprofile"
-