diff --git a/06osdeps_from_source.autobuild b/06osdeps_from_source.autobuild
deleted file mode 100644
index da7b88df..00000000
--- a/06osdeps_from_source.autobuild
+++ /dev/null
@@ -1,18 +0,0 @@
-in_flavor 'master', 'stable' do
-    cmake_package 'external/opencv' do |pkg|
-        pkg.define("CMAKE_BUILD_TYPE","Release")
-        if not RUBY_PLATFORM.downcase.include?("arm")
-           pkg.define("ENABLE_SSE3","ON")
-           pkg.define("ENABLE_SSE41","OFF")
-           pkg.define("ENABLE_SSE42","OFF")
-           pkg.define("ENABLE_SSSE3","OFF")
-        end
-        pkg.define("BUILD_EXAMPLES","OFF")
-        pkg.define("BUILD_NEW_PYTHON_SUPPORT","OFF")
-        pkg.define("WITH_FFMPEG","OFF")
-        pkg.define("BUILD_TESTS","OFF")
-    end
-    Autoproj.add_osdeps_overrides 'opencv', :package => 'external/opencv'
-    remove_from_default 'external/opencv'
-end
-
diff --git a/rock.osdeps b/rock.osdeps
index 54698bb0..a94878ad 100644
--- a/rock.osdeps
+++ b/rock.osdeps
@@ -121,15 +121,7 @@ qt-designer:
     macos-brew: qt4
 
 opencv:
-    debian:
-        'wheezy,sid':
-                - libopencv-dev
-    ubuntu:
-        '10.04,10.10,11.04,11.10': nonexistent
-        default:
-                - libopencv-dev
-                - libcv-dev
-                - libhighgui-dev
+    debian, ubuntu: libopencv-dev
     gentoo: media-libs/opencv
     fedora: opencv-devel
     arch,manjarolinux: opencv
@@ -144,3 +136,6 @@ jpeg:
 
 bundler: gem
 cucumber: gem
+
+clang-3.5:
+    debian: clang-3.5 libclang-3.5-dev
diff --git a/source.yml b/source.yml
index 27223891..8773a9f3 100644
--- a/source.yml
+++ b/source.yml
@@ -83,10 +83,6 @@ version_control:
       type: archive
       url: https://github.com/SINTEF-Geometry/SISL/archive/SISL-4.6.0.tar.gz
       update_cached_file: false
-    - external/opencv:
-      type: archive
-      url: http://downloads.sourceforge.net/project/opencvlibrary/opencv-unix/2.4.9/opencv-2.4.9.zip
-      update_cached_file: false
 
 overrides:
     - ^(orogen|typelib|rtt|utilrb|utilmm|rtt_typelib|tools/metaruby)$: