diff --git a/0001-no-return-in-non-void.patch b/0001-no-return-in-non-void.patch
index 21d0f03..9f05bce 100644
--- a/0001-no-return-in-non-void.patch
+++ b/0001-no-return-in-non-void.patch
@@ -90,3 +90,13 @@ index b430ee5..29c387f 100644
  }
  
  /**
+--- a/modules/demux/mp4/mp4.c.orig	2015-04-13 16:35:15.220228877 +0200
++++ b/modules/demux/mp4/mp4.c	2015-04-13 16:35:15.255228142 +0200
+@@ -277,6 +277,7 @@
+ 
+         i_sample -= ck->p_sample_count_pts[i_index];
+     }
++    return 0;
+ }
+ 
+ static inline int64_t MP4_GetMoviePTS(demux_sys_t *p_sys )
diff --git a/vlc-2.2.0.tar.xz b/vlc-2.2.0.tar.xz
deleted file mode 100644
index 0a61414..0000000
--- a/vlc-2.2.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:5e0a27e248c47da723a696420aca3a4dd15cc3ed8cc81618d3f1dc8661b25517
-size 20861760
diff --git a/vlc-2.2.1.tar.xz b/vlc-2.2.1.tar.xz
new file mode 100644
index 0000000..97fb690
--- /dev/null
+++ b/vlc-2.2.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:543d9d7e378ec0fa1ee2e7f7f5acf8c456c7d0ecc32037171523197ef3cf1fcb
+size 20940288
diff --git a/vlc-rpmlintrc b/vlc-rpmlintrc
index 2fc0db0..9beb854 100644
--- a/vlc-rpmlintrc
+++ b/vlc-rpmlintrc
@@ -4,6 +4,3 @@ addFilter("libvlccore.* shared-lib-calls-exit")
 # there's a good reason for packaging vlc and vlc.desktop separately
 addFilter("desktopfile-without-binary")
 
-# plugins.dat is created on startup if necessary
-addFilter("vlc-noX.* ghost-files-without-postin")
-
diff --git a/vlc.changes b/vlc.changes
index e0bcb56..7475251 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,7 +1,66 @@
+-------------------------------------------------------------------
+Tue Apr 14 10:38:47 UTC 2015 - aloisio@gmx.com
+
+- Removed DTV/DVB patch that was fixed upstream.
+
+-------------------------------------------------------------------
+Mon Apr 13 14:59:16 UTC 2015 - joerg.lorenzen@ki.tng.de
+
+- Update to version 2.2.1:
+  + Codec:
+    - Fix compilation with older libavcodec versions.
+    - Fix some VP9 decoding.
+    - Fix flac crashes.
+    - Fix lpcm channel ordering.
+    - Fix potential NULL dereference in dmo.
+    - Fix teletext framing code in DVB PES packets.
+    - Fix potential buffer overflow in schroendinger decoder.
+    - Fix AAC samplerate.
+  + Demuxers:
+    - Fix MP4 chapters.
+    - Fix MKV overseeking, introducing slowness over network shares.
+    - Fix crash when playing SPC files.
+    - Fix ATRAC3 playback in MKV.
+    - Revert to older ASX code.
+    - Workaround TS issue with mpeg-audio.
+  + Access:
+    - Fix sftp read and close sockets.
+    - Fix DTV build with Linux DVB versions < 5.8.
+    - Fix UDP/RTP input on Windows.
+  + Audio output:
+    - Fix Alsa HDMI plugs.
+    - Improve Alsa output, with larger buffers.
+    - Fix DirectSound output with multi-channel files.
+  + OS X:
+    - Fix numerous crashes in the UI.
+    - Fix video-wallpaper mode.
+    - Fix race when starting VLC from command line.
+  + Qt:
+    - Fix recent items behaviour.
+    - Fix rotation filter activation.
+    - Fix mux modules names for the streaming wizard.
+  + Win32:
+    - Timestamp the signature of the dlls.
+    - Fix extensions registration during install.
+    - Fix extensions dialog crash.
+    - Default to no DxVA decoding.
+  + libVLC:
+    - fix libvlc_media_get_stats.
+  + Updated translations.
+- Fixed patch 0001-no-return-in-non-void.patch.
+
+-------------------------------------------------------------------
+Sun Apr 12 08:47:32 UTC 2015 - dimstar@opensuse.org
+
+- Require at least the version of libbluray1 that was used during
+  build. libbluray.so.1 has a strange ABI diff between 0.3 and 0.7.
+  Libbluray had an API/ABI break at 0.5, which was not represented
+  in a soname bump (boo#926842).
+
 -------------------------------------------------------------------
 Tue Mar 31 10:18:25 UTC 2015 - dvlaeev@suse.com
 
-- Fix package lists for PowerPC architectures 
+- Fix package lists for PowerPC architectures.
 
 -------------------------------------------------------------------
 Tue Mar 17 15:21:39 UTC 2015 - dimstar@opensuse.org
diff --git a/vlc.spec b/vlc.spec
index 683c9da..be963ad 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -31,7 +31,7 @@
 %endif
 
 Name:           vlc
-Version:        2.2.0
+Version:        2.2.1
 Release:        0
 Summary:        Video Lan Client multimedia player
 License:        GPL-2.0+ and LGPL-2.1+
@@ -66,6 +66,7 @@ BuildRequires:  libavc1394-devel >= 0.5.3
 BuildRequires:  libcddb-devel >= 0.9.5
 BuildRequires:  libcdio-devel >= 0.78.2
 BuildRequires:  libdc1394-devel >= 2.1.0
+BuildRequires:  libdvbpsi-devel >= 1.0.0
 BuildRequires:  libgcrypt-devel
 BuildRequires:  libidn-devel
 BuildRequires:  libjack-devel >= 1.9.7
@@ -142,7 +143,6 @@ BuildRequires:  pkgconfig(libva-x11)
 BuildRequires:  pkgconfig(taglib) >= 1.9
 %endif
 %if 0%{?suse_version} > 1140
-BuildRequires:  libdvbpsi-devel >= 1.0.0
 BuildRequires:  pkgconfig(dbus-1) >= 1.6.0
 BuildRequires:  pkgconfig(freerdp) >= 1.0.1
 BuildRequires:  pkgconfig(gnutls) >= 3.2.0
@@ -227,6 +227,9 @@ Requires:       libvlccore%{libvlccore} = %{version}-%{release}
 Recommends:     %{name}-noX-lang
 Recommends:     %{name}-codecs
 Recommends:     libdvdcss
+# This is a hack only due to libbluray not having versioned symbols as well as
+# having a strange ABI/API break between 0.3 and 0.7
+%requires_ge    libbluray1
 Conflicts:      %{conflicts}-noX
 
 %description noX
@@ -295,11 +298,6 @@ FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y')
 sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
 sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
 
-# no --disable-dvb switch unfortunately
-%if 0%{?suse_version} <= 1140
-sed -e '/^#include.*dvb/d' -i configure
-%endif
-
 echo '********* ENDED PREP PHASE *********'
 date
 
@@ -319,11 +317,7 @@ export CXXFLAGS="%{optflags}"
    --disable-avcodec                    \
 %endif
    --enable-dca                         \
-%if 0%{?suse_version} > 1140
    --enable-dvbpsi                      \
-%else
-   --disable-dvbpsi                     \
-%endif
 %if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
    --enable-dvdnav                      \
    --enable-dvdread                     \
@@ -653,6 +647,8 @@ done
 %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
 %{_libdir}/vlc/plugins/access/libattachment_plugin.so
 %{_libdir}/vlc/plugins/access/libcdda_plugin.so
+%{_libdir}/vlc/plugins/access/libdtv_plugin.so
+%{_libdir}/vlc/plugins/access/libdvb_plugin.so
 %{_libdir}/vlc/plugins/access/librar_plugin.so
 %{_libdir}/vlc/plugins/access/libsftp_plugin.so
 %{_libdir}/vlc/plugins/access/libsmb_plugin.so
@@ -662,11 +658,6 @@ done
 %{_libdir}/vlc/plugins/access/libdc1394_plugin.so
 %{_libdir}/vlc/plugins/access/libdv1394_plugin.so
 
-%if 0%{?suse_version} > 1140
-%{_libdir}/vlc/plugins/access/libdtv_plugin.so
-%{_libdir}/vlc/plugins/access/libdvb_plugin.so
-%endif
-
 %if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
 %{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
 %{_libdir}/vlc/plugins/access/libdvdread_plugin.so
@@ -843,10 +834,7 @@ done
 %{_libdir}/vlc/plugins/demux/libreal_plugin.so
 %{_libdir}/vlc/plugins/demux/libsmf_plugin.so
 %{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so
-
-%if 0%{?suse_version} > 1140
 %{_libdir}/vlc/plugins/demux/libts_plugin.so
-%endif
 %{_libdir}/vlc/plugins/demux/libtta_plugin.so
 %{_libdir}/vlc/plugins/demux/libty_plugin.so
 %{_libdir}/vlc/plugins/demux/libvc1_plugin.so
@@ -891,10 +879,7 @@ done
 %{_libdir}/vlc/plugins/mux/libmux_mpjpeg_plugin.so
 %{_libdir}/vlc/plugins/mux/libmux_ogg_plugin.so
 %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so
-
-%if 0%{?suse_version} > 1140
 %{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so
-%endif
 %{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so
 %if 0%{?BUILD_ORIG}
 %{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so