diff --git a/.gitignore b/.gitignore
index a5990cb..940242d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,3 +18,4 @@
 /audacious-3.4.1.tar.bz2
 /audacious-3.4.2.tar.bz2
 /audacious-3.4.3.tar.bz2
+/audacious-3.5.tar.bz2
diff --git a/audacious.spec b/audacious.spec
index e695c7f..235a930 100644
--- a/audacious.spec
+++ b/audacious.spec
@@ -1,13 +1,13 @@
 # Minimum audacious/audacious-plugins version in inter-package dependencies.
-%global aud_ver 3.4.2
+%global aud_ver 3.5
 
-%global tar_ver 3.4.3
+%global tar_ver 3.5
 
 # Audacious Generic Plugin API defined in audacious-libs subpackage.
 
 
 Name: audacious
-Version: 3.4.3
+Version: 3.5
 Release: 1%{?dist}
 
 License: BSD
@@ -25,7 +25,6 @@ BuildRequires: libguess-devel
 BuildRequires: dbus-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: desktop-file-utils
-BuildRequires: doxygen
 
 # The automatic SONAME dependency is not enough
 # during version upgrades.
@@ -57,19 +56,16 @@ Group: System Environment/Libraries
 # Provide Generic Plugin API value for plugin packages to depend on.
 # As defined in /usr/include/audacious/plugin.h: _AUD_PLUGIN_VERSION
 # This must be an exact match for plugin .so files to load.
-%global aud_plugin_api 43
-%global aud_plugin_api_min 40
+%global aud_plugin_api 45
+%global aud_plugin_api_min 45
 Provides: audacious(plugin-api)%{?_isa} = %{aud_plugin_api}
 %{?_isa:Provides: audacious(plugin-api) = %{aud_plugin_api}}
 
-Provides: audacious(plugin-api)%{?_isa} = 42
-%{?_isa:Provides: audacious(plugin-api) = 42}
+#Provides: audacious(plugin-api)%{?_isa} = 45
+#%{?_isa:Provides: audacious(plugin-api) = 45}
 
-Provides: audacious(plugin-api)%{?_isa} = 41
-%{?_isa:Provides: audacious(plugin-api) = 41}
-
-Provides: audacious(plugin-api)%{?_isa} = %{aud_plugin_api_min}
-%{?_isa:Provides: audacious(plugin-api) = %{aud_plugin_api_min}}
+#Provides: audacious(plugin-api)%{?_isa} = %{aud_plugin_api_min}
+#%{?_isa:Provides: audacious(plugin-api) = %{aud_plugin_api_min}}
 
 %description libs
 Library files for the Audacious audio player.
@@ -82,28 +78,20 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 Requires: glib2-devel%{?_isa}
 Requires: gtk3-devel%{?_isa}
 Requires: dbus-glib-devel%{?_isa}
+# added on 2014-02-23 (F21 development)
+Obsoletes: %{name}-doc < 3.5
 
 %description devel
 Files needed when building software for the Audacious audio player.
 
 
-%package doc
-Summary: Documentation files for the Audacious audio player
-Group: Documentation
-BuildArch: noarch
-
-%description doc
-Extra documentation files for the Audacious audio player, such as
-generated documentation for developers.
-
-
 %prep
 %setup -q -n %{name}-%{tar_ver}
 
 # Verify the value of the audacious(plugin-api) Provides.
-api=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\+' src/audacious/plugin.h | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\([0-9]\+\).*!\1!')
+api=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\+' src/audacious/api.h | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\([0-9]\+\).*!\1!')
 [ "${api}" == "%{aud_plugin_api}" ] || exit -1
-api_min=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION_MIN' src/audacious/plugin.h | sed 's!.*_AUD_PLUGIN_VERSION_MIN[ ]*\([0-9]\+\).*!\1!')
+api_min=$(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION_MIN' src/audacious/api.h | sed 's!.*_AUD_PLUGIN_VERSION_MIN[ ]*\([0-9]\+\).*!\1!')
 [ "${api_min}" == "%{aud_plugin_api_min}" ] || exit -1
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
@@ -115,7 +103,6 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --disable-rpath \
     --disable-dependency-tracking
 make %{?_smp_mflags}
-doxygen Doxyfile
 
 
 %install
@@ -173,10 +160,16 @@ fi
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/*.pc
 
-%files doc
-%doc doc/html/
 
 %changelog
+* Wed Apr 23 2014 Michael Schwendt <mschwendt@fedoraproject.org> - 3.5-1
+- Update to 3.5 final release.
+- Merge spec changes from packages released via Fedora Copr:
+  - Obsolete -doc subpackage.
+  - Disable Doxygen temporarily (missing 'doc' dir) build dummy -doc package.
+  - Plugin version moved to api.h header.
+  - Generic plugin API/ABI bumped to 45, with 45 also being the minimum.
+
 * Wed Jan  8 2014 Michael Schwendt <mschwendt@fedoraproject.org> - 3.4.3-1
 - Update to 3.4.3 (a few bug-fixes and translation updates).
 
diff --git a/sources b/sources
index dfdf46a..10faf35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3935e3c1e6bdc2907ce2672a85476f20  audacious-3.4.3.tar.bz2
+1d0842d6c2aa3d598b3e26e1994be757  audacious-3.5.tar.bz2