diff --git a/llvm-3.1-3.1/configure b/llvm-3.1-3.1/configure
index c20a875..03e2edc 100755
--- a/llvm-3.1-3.1/configure
+++ b/llvm-3.1-3.1/configure
@@ -13406,8 +13406,8 @@ for ac_lib in '' opagent; do
   if test -z "$ac_lib"; then
     ac_res="none required"
   else
-    ac_res="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed"
-    LIBS="-Wl,--as-needed -l$ac_lib -Wl,--no-as-needed $ac_func_search_save_LIBS"
+    ac_res="-Wl,--as-needed -l$ac_lib -lbfd -Wl,--no-as-needed"
+    LIBS="-Wl,--as-needed -l$ac_lib -lbfd -Wl,--no-as-needed $ac_func_search_save_LIBS"
   fi
   rm -f conftest.$ac_objext conftest$ac_exeext
 if { (ac_try="$ac_link"
diff --git a/llvm-3.1-3.1/debian/control b/llvm-3.1-3.1/debian/control
index 3858c9b..16423bc 100644
--- a/llvm-3.1-3.1/debian/control
+++ b/llvm-3.1-3.1/debian/control
@@ -9,7 +9,6 @@ Build-Depends: debhelper (>= 8.1.3), flex, bison, dejagnu, tcl8.5, expect,
     sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
     lsb-release, xz-utils, 
     binutils-dev (>= 2.20.51.20100222-1~), ocaml-nox (>= 3.11.2), ocaml-best-compilers | ocaml-nox, dh-ocaml (>= 0.9.1)
-Build-Conflicts: oprofile
 Standards-Version: 3.9.3
 Homepage: http://www.llvm.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm/trunk/
diff --git a/llvm-3.1-3.1/debian/control.in/source b/llvm-3.1-3.1/debian/control.in/source
index b45c489..28ef7c8 100644
--- a/llvm-3.1-3.1/debian/control.in/source
+++ b/llvm-3.1-3.1/debian/control.in/source
@@ -9,7 +9,7 @@ Build-Depends: debhelper (>= 8.1.3), flex, bison, dejagnu, tcl8.5, expect,
     sharutils, autotools-dev (>= 20060702.1), libffi-dev (>= 3.0.9),
     lsb-release, xz-utils, 
     binutils-dev (>= 2.20.51.20100222-1~) @BUILDDEPS@
-Build-Conflicts: oprofile @BUILDCONFLICTS@
+Build-Conflicts: @BUILDCONFLICTS@
 Standards-Version: 3.9.3
 Homepage: http://www.llvm.org/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-llvm/llvm/trunk/
diff --git a/llvm-3.1-3.1/debian/packages.d/llvm.mk b/llvm-3.1-3.1/debian/packages.d/llvm.mk
index f115a21..6be1fa1 100644
--- a/llvm-3.1-3.1/debian/packages.d/llvm.mk
+++ b/llvm-3.1-3.1/debian/packages.d/llvm.mk
@@ -29,7 +29,7 @@ llvm_packages	:= \
 
 llvm_confargs	:= $(confargs) \
 	--prefix=$(PF) --disable-assertions \
-	--enable-optimized --with-optimize-option=' $(opt_flags)' --enable-pic --enable-libffi \
+	--enable-optimized --with-optimize-option=' $(opt_flags)' --enable-pic --enable-libffi --with-oprofile \
 	--with-ocaml-libdir=$(OCAML_STDLIB_DIR)/llvm-$(UVERSION) \
 	--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
     --with-binutils-include=/usr/include
diff --git a/llvm-3.1-3.1/lib/ExecutionEngine/OProfileJIT/OProfileWrapper.cpp b/llvm-3.1-3.1/lib/ExecutionEngine/OProfileJIT/OProfileWrapper.cpp
index d67f537..7c0d395 100644
--- a/llvm-3.1-3.1/lib/ExecutionEngine/OProfileJIT/OProfileWrapper.cpp
+++ b/llvm-3.1-3.1/lib/ExecutionEngine/OProfileJIT/OProfileWrapper.cpp
@@ -29,6 +29,7 @@
 #include <dirent.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <unistd.h>
 
 namespace {