diff --git a/vlc.changes b/vlc.changes
index 69b403d..eb5f7f3 100644
--- a/vlc.changes
+++ b/vlc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Aug 10 16:30:31 UTC 2016 - dimstar@opensuse.org
+
+- BuildConflict pkgconfig(avformat) >=55: vlc 2.2.x is not yet
+  compatible with these updates.
+
 -------------------------------------------------------------------
 Tue Aug  9 11:14:19 UTC 2016 - dimstar@opensuse.org
 
diff --git a/vlc.spec b/vlc.spec
index 013b6fe..59a0b5d 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -126,6 +126,7 @@ BuildRequires:  update-desktop-files
 BuildRequires:  vcdimager-devel
 BuildRequires:  xosd-devel
 BuildRequires:  xz
+BuildConflicts: pkgconfig(libavutil) >= 55
 Requires:       %{name}-noX = %{version}-%{release}
 # We need the noX package first, as it contains vlc-cache-gen
 PreReq:         %{name}-noX