diff --git a/.gitignore b/.gitignore
index 0181af1..3906f06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
-gst-libav-1.0.2.tar.xz
+gst-libav-1.0.5.tar.xz
+libav-0.8.5.tar.xz
diff --git a/gstreamer1-libav.spec b/gstreamer1-libav.spec
index 93c7b89..334a4ce 100644
--- a/gstreamer1-libav.spec
+++ b/gstreamer1-libav.spec
@@ -1,11 +1,13 @@
 Name:           gstreamer1-libav
-Version:        1.0.2
-Release:        2%{?dist}
+Version:        1.0.5
+Release:        1%{?dist}
 Summary:        GStreamer 1.0 libav-based plug-ins
 Group:          Applications/Multimedia
 License:        LGPLv2+
 URL:            http://gstreamer.freedesktop.org/
 Source0:        http://gstreamer.freedesktop.org/src/gst-libav/gst-libav-%{version}.tar.xz
+# We drop in a newer libav to get all the security bugfixes from there!
+Source1:        http://libav.org/releases/libav-0.8.5.tar.xz
 Patch0:         gst-ffmpeg-0.10.12-ChangeLog-UTF-8.patch
 BuildRequires:  gstreamer1-devel >= 1.0.0
 BuildRequires:  gstreamer1-plugins-base-devel >= 1.0.0
@@ -26,7 +28,9 @@ This package provides libav-based GStreamer plug-ins.
 
 
 %prep
-%setup -q -n gst-libav-%{version}
+%setup -q -n gst-libav-%{version} -a 1
+rm -r gst-libs/ext/libav
+mv libav-0.8.5 gst-libs/ext/libav
 %patch0 -p1
 
 
@@ -52,6 +56,11 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/libgst*.la
 
 
 %changelog
+* Sat Mar  2 2013 Hans de Goede <j.w.r.degoede@gmail.com> - 1.0.5-1
+- Rebase to 1.0.5 (rf#2688)
+- Upgrade the buildin libav to 0.8.5 to get all the security fixes from
+  upstream libav
+
 * Sat Nov  3 2012 Hans de Goede <j.w.r.degoede@gmail.com> - 1.0.2-2
 - Build included libav with the default RPM_OPT_FLAGS (rf#2560, rf#2472)
 
diff --git a/sources b/sources
index 9d5e0a7..0322dd7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-b932d386711a1b14d08c3b7d3021934b  gst-libav-1.0.2.tar.xz
+00011aa062ce734ba86da499f800269e  gst-libav-1.0.5.tar.xz
+3f0fd111575e91c8d57bd8b4d5e3802a  libav-0.8.5.tar.xz