diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 814da51..6b79e34 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -1,19 +1,16 @@
-%if 0%{?fedora} > 13
 %global aud_plugin_api %(grep '[ ]*#define[ ]*__AUDACIOUS_PLUGIN_API__' %{_includedir}/audacious/plugin.h 2>/dev/null | sed 's!.*__AUDACIOUS_PLUGIN_API__[ ]*\\([0-9]\\+\\).*!\\1!')
-%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0)
-Requires: audacious(plugin-api) = %{aud_plugin_api}
-%endif
+%if 0%{aud_plugin_api} > 0
+%global aud_plugin_dep Requires: audacious(plugin-api) = %{aud_plugin_api}
 %endif
+%{?aud_plugin_dep}
 
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
-# We need at least 2.4.3 because of the plugin API change after 2.4.0
-# and in 2.4.3
 %global aud_ver 2.4.3
 Requires: audacious >= %{aud_ver}
 
 Name: audacious-plugins
 Version: 2.4.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Summary: Plugins for the Audacious audio player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -103,6 +100,7 @@ itself forked from XMMS.
 %package jack
 Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
+%{?aud_plugin_dep}
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description jack
@@ -114,6 +112,7 @@ Jack Audio Connection Kit (JACK) sound service.
 %package adplug
 Summary: Audacious input plugin for AdLib/OPL based file formats
 Group: Applications/Multimedia
+%{?aud_plugin_dep}
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description adplug
@@ -126,6 +125,7 @@ AdLib/OPL2/3 based sound trackers.
 %package amidi
 Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
+%{?aud_plugin_dep}
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description amidi
@@ -136,6 +136,7 @@ input plugin for Audacious.
 %package sid
 Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
+%{?aud_plugin_dep}
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 Requires(post): desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -148,6 +149,8 @@ providers may build it with libsidplay 2 instead.
 
 
 %prep
+# Enforce availability of the audacious(plugin-api) dependency.
+%{!?aud_plugin_dep:echo 'No audacious(plugin-api) dependency!' && exit -1}
 %setup -q -n audacious-plugins-fedora-%{version}
 %patch0 -p1 -b .xmms-skindir
 %patch1 -p1 -b .libdir
@@ -255,6 +258,10 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Fri Feb  4 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.4.3-7
+- Enhance the audacious(plugin-api) stuff in the spec file and apply it
+  to all subpackages.
+
 * Thu Feb  3 2011 Michael Schwendt <mschwendt@fedoraproject.org> - 2.4.3-6
 - Merge fix for AUDPLUG-323 (mtp).