diff --git a/picard.changes b/picard.changes
index c2e45e4..3b44167 100644
--- a/picard.changes
+++ b/picard.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Feb 20 09:45:40 UTC 2012 - pascal.bleser@opensuse.org
+
+- add conditional BUILD_ORIG_ADDON to buildrequire ffmpeg-devel and enable
+  ffmpeg fingerprinting support when picard is linked and built on Packman
+
 -------------------------------------------------------------------
 Mon Aug  1 08:25:44 CEST 2011 - ohering@suse.de
 
diff --git a/picard.spec b/picard.spec
index 4238cd4..4b807f9 100644
--- a/picard.spec
+++ b/picard.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package picard
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -22,7 +22,7 @@ Name:           picard
 Version:        0.15.1
 Release:        1
 Summary:        The Next Generation MusicBrainz Tagger
-License:        GPLv2+
+License:        GPL-2.0+
 Group:          Productivity/Multimedia/Sound/Utilities
 Url:            http://musicbrainz.org/doc/PicardTagger
 Source0:        http://ftp.musicbrainz.org/pub/musicbrainz/picard/%{name}-%{version}.tar.gz
@@ -42,6 +42,9 @@ Source16:       http://users.musicbrainz.org/~brianfreud/SearchSoundtrackCollect
 Source17:       http://users.musicbrainz.org/~brianfreud/SearchSoundtrackINFO3.py
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%if 0%{?BUILD_ORIG_ADDON:1}
+BuildRequires:  ffmpeg-devel
+%endif
 BuildRequires:  desktop-file-utils gcc-c++ libofa-devel python-devel
 BuildRequires:  libdiscid-devel
 %if 0%{?suse_version}