diff --git a/.gitignore b/.gitignore
index f01f80d..28d0e1a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 gst-plugins-bad-1.4.5.tar.xz
+gst-plugins-bad-1.6.1.tar.xz
diff --git a/0001-fix-faad2-version-check.patch b/0001-fix-faad2-version-check.patch
deleted file mode 100644
index 8d7b610..0000000
--- a/0001-fix-faad2-version-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From bde0f119097117cf0256e450af4267a47782260b Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Wed, 13 May 2015 16:23:26 +0200
-Subject: fix faad2 version check
-
-On fedora 22, the output of cpp inserts extra debug comments, which
-makes our regexp for the faad2 version check fail. This in turn causes
-it to compile with the wrong arguments passed which then causes stack
-corruption and crashes.
-
-Fix this by only checking for the version (which should be by itself on
-a single line). This is potentially less safe, it might be possible that
-a similar string would appear in a later version in the header file.
-
-Fixes https://bugzilla.gnome.org/show_bug.cgi?id=748571
-
-diff --git a/configure.ac b/configure.ac
-index 4e2823e..c56295e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -2050,9 +2050,9 @@ AG_GST_CHECK_FEATURE(FAAD, [AAC decoder plug-in], faad, [
-       AC_MSG_CHECKING([Checking FAAD2 version in $faad_hdr])
-       for minor in 10 9 8 7 6 5 0; do
-         if test x$faad2_minor_version = "x"; then
--          AC_EGREP_CPP([GST_CHECK_FAAD_VERSION \"2\.$minor\"], [
-+          AC_EGREP_CPP([\"2\.$minor\"$], [
-               #include <$faad_hdr>
--              GST_CHECK_FAAD_VERSION FAAD2_VERSION
-+              FAAD2_VERSION
-             ], [
-               faad2_minor_version=$minor
-             ])
--- 
-cgit v0.10.2
-
diff --git a/gstreamer1-plugins-bad-freeworld.spec b/gstreamer1-plugins-bad-freeworld.spec
index 9e01fa3..faa7a71 100644
--- a/gstreamer1-plugins-bad-freeworld.spec
+++ b/gstreamer1-plugins-bad-freeworld.spec
@@ -1,19 +1,17 @@
 # which plugins to actually build and install
 %global gstdirs gst/dvbsuboverlay gst/dvdspu gst/siren
-%global extdirs ext/dts ext/faad ext/libmms ext/mimic ext/mpeg2enc ext/mpg123 ext/mplex ext/rtmp ext/voamrwbenc
+%global extdirs ext/dts ext/faad ext/libmms ext/mimic ext/mpeg2enc ext/mpg123 ext/mplex ext/rtmp ext/voamrwbenc ext/x265
 
 Summary:        GStreamer 1.0 streaming media framework "bad" plug-ins
 Name:           gstreamer1-plugins-bad-freeworld
-Version:        1.4.5
-Release:        2%{?dist}
+Version:        1.6.1
+Release:        1%{?dist}
 License:        LGPLv2+
 Group:          Applications/Multimedia
 URL:            http://gstreamer.freedesktop.org/
 Source0:        http://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-%{version}.tar.xz
-# From upstream git
-Patch1:         0001-fix-faad2-version-check.patch
-BuildRequires:  gstreamer1-devel >= 1.4.0
-BuildRequires:  gstreamer1-plugins-base-devel >= 1.4.0
+BuildRequires:  gstreamer1-devel >= 1.6.0
+BuildRequires:  gstreamer1-plugins-base-devel >= 1.6.0
 BuildRequires:  check
 BuildRequires:  gettext-devel
 BuildRequires:  libXt-devel
@@ -30,8 +28,7 @@ BuildRequires:  vo-amrwbenc-devel
 #BuildRequires:  vo-aacenc-devel
 BuildRequires:  libmpg123-devel
 BuildRequires: libusbx-devel
-# For autoreconf
-BuildRequires: libtool
+BuildRequires: x265-devel
 
 %description
 GStreamer is a streaming media framework, based on graphs of elements which
@@ -43,9 +40,9 @@ well enough, or the code is not of good enough quality.
 
 %prep
 %setup -q -n gst-plugins-bad-%{version}
-%patch1 -p1
-# For patch1
-autoreconf -ivf
+# hack to allow building against 1.6.0 as 1.6.1 is not yet in the buildroot
+sed -i 's/GST_REQ=1.6.1/GST_REQ=1.6.0/' configure
+sed -i 's/GSTPB_REQ=1.6.1/GSTPB_REQ=1.6.0/' configure
 
 
 %build
@@ -95,9 +92,14 @@ rm $RPM_BUILD_ROOT%{_libdir}/gstreamer-1.0/*.la
 %{_libdir}/gstreamer-1.0/libgstrtmp.so
 #%%{_libdir}/gstreamer-1.0/libgstvoaacenc.so
 %{_libdir}/gstreamer-1.0/libgstvoamrwbenc.so
+%{_libdir}/gstreamer-1.0/libgstx265.so
 
 
 %changelog
+* Sat Oct 31 2015 Hans de Goede <j.w.r.degoede@gmail.com> - 1.6.1-1
+- Rebase to new upstream release 1.6.1
+- Enable x265 plugin
+
 * Sat May 16 2015 Hans de Goede <j.w.r.degoede@gmail.com> - 1.4.5-2
 - Add a patch from upstream fixing a faad2 crash which crashes firefox (rf3636)
 
diff --git a/sources b/sources
index 89472aa..f5ecf93 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0bb39412cf4a48fe0397bcf3a7cd451  gst-plugins-bad-1.4.5.tar.xz
+c92d7d32de68e7293712bf9b6c99dc77  gst-plugins-bad-1.6.1.tar.xz