diff --git a/alsa-tools.spec b/alsa-tools.spec
index 7aab26b..3dbfe6e 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -1,6 +1,9 @@
-%{?!_without_tools:     %define builddirstools as10k1 envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
-%{?_without_tools:      %{!?_with_firmware: %define _with_firmware 1}}
-%{?_with_firmware:      %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
+# Disable firmware build for now; the alsa-firmware package is not built
+# for Fedora yet (bug #217259)
+%define _without_firmware 1
+
+%{?!_without_tools:     %define builddirstools as10k1 echomixer envy24control hdspconf hdspmixer rmedigicontrol sbiload sb16_csp sscape_ctl us428control }
+%{?!_without_firmware:  %define builddirsfirmw hdsploader mixartloader usx2yloader vxloader }
 
 # The source tarball has been pruned to remove the "ac3dec" directory, due
 # to legal concerns that the contents might be subject to patent claims
@@ -11,12 +14,19 @@
 
 Summary:        Specialist tools for ALSA
 Name:           alsa-tools
-Version:        1.0.12
-Release:        4%{?dist}
+Version:        1.0.15
+Release:        1%{?dist}
 License:        GPL
 Group:          Applications/Multimedia
 URL:            http://www.alsa-project.org/
 Source0:        %{name}-%{version}-pruned.tar.bz2
+
+# The icons below were created by Tim Jackson from screenshots of the
+# apps in question. They suck, a lot. Better alternatives welcome!
+Source1:        envy24control.desktop
+Source2:        envy24control.png
+Source3:        echomixer.desktop
+Source4:        echomixer.png
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel >= %{version}
 %if 0%{!?_without_tools:1}
@@ -36,6 +46,7 @@ certain sound cards.
 
 * as10k1 - AS10k1 Assembler
 * cspctl - Sound Blaster 16 ASP/CSP control program
+* echomixer - Mixer for Echo Audio (indigo) devices
 * envy24control - Control tool for Envy24 (ice1712) based soundcards
 * hdspmixer - Mixer for the RME Hammerfall DSP cards
 * rmedigicontrol - Control panel for RME Hammerfall cards
@@ -77,9 +88,17 @@ done
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
 
+mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/{pixmaps,applications}
+
 for i in %{?builddirstools:%builddirstools} %{?builddirsfirmw:%builddirsfirmw}
 do 
   case $i in
+    echomixer)
+      (cd $i ; %makeinstall ; install -m 644 %{SOURCE4} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE3} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1
+      ;;
+    envy24control)
+      (cd $i ; %makeinstall ; install -m 644 %{SOURCE2} %{buildroot}%{_datadir}/pixmaps/ ; install -m 644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/applications/ ) || exit 1
+      ;;
     hdspconf)
       (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
       ;;
@@ -124,6 +143,7 @@ done
 %defattr(-,root,root,-)
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/as10k1
+%doc %{_docdir}/%{name}-%{version}/echomixer
 %doc %{_docdir}/%{name}-%{version}/envy24control
 %doc %{_docdir}/%{name}-%{version}/hdspconf
 %doc %{_docdir}/%{name}-%{version}/hdspmixer
@@ -132,6 +152,7 @@ done
 %doc %{_docdir}/%{name}-%{version}/sb16_csp
 %{_bindir}/as10k1
 %{_bindir}/cspctl
+%{_bindir}/echomixer
 %{_bindir}/envy24control
 %{_bindir}/hdspconf
 %{_bindir}/hdspmixer
@@ -139,16 +160,20 @@ done
 %{_bindir}/sbiload
 %{_bindir}/sscape_ctl
 %{_bindir}/us428control
+%{_datadir}/applications/fedora-echomixer.desktop
+%{_datadir}/applications/fedora-envy24control.desktop
 %{_datadir}/applications/fedora-hdspconf.desktop
 %{_datadir}/applications/fedora-hdspmixer.desktop
 %{_datadir}/man/man1/cspctl.1.gz
 %{_datadir}/man/man1/envy24control.1.gz
+%{_datadir}/pixmaps/echomixer.png
+%{_datadir}/pixmaps/envy24control.png
 %{_datadir}/pixmaps/hdspconf.png
 %{_datadir}/pixmaps/hdspmixer.png
 %{_datadir}/sounds/
-%endif # ?!_without_tools
+%endif
 
-%if 0%{?_with_firmware:1}
+%if 0%{!?_without_firmware:1}
 %files firmware
 %defattr(-,root,root,-)
 %doc %{_docdir}/%{name}-%{version}/hdsploader
@@ -157,14 +182,19 @@ done
 %doc %{_docdir}/%{name}-%{version}/vxloader
 %{_sysconfdir}/hotplug/usb/tascam_fpga
 %{_sysconfdir}/hotplug/usb/tascam_fw
-%{_sysconfdir}/hotplug/usb/tascam_fw.usermap
+%attr(0644,root,root) %{_sysconfdir}/hotplug/usb/tascam_fw.usermap
 %{_bindir}/hdsploader
 %{_bindir}/mixartloader
 %{_bindir}/usx2yloader
 %{_bindir}/vxloader
-%endif # ?_with_firmware
+%endif
 
 %changelog
+* Sat Jan 05 2008 Tim Jackson <rpm@timj.co.uk> - 1.0.15-1
+- Update to upstream 1.0.15
+- Add icon for envy24control
+- Build echomixer
+
 * Sat Dec 09 2006 Tim Jackson <rpm@timj.co.uk> - 1.0.12-4
 - ExcludeArch ppc (#219010)
 
diff --git a/sources b/sources
index 86cb334..a1ecd62 100644
--- a/sources
+++ b/sources
@@ -1 +1,5 @@
-7342056614623273abccb1cd38a674d8  alsa-tools-1.0.12-pruned.tar.bz2
+57af85a810ed770885aec2a5b35648e6  echomixer.desktop
+38db1b88c44adb5591f87173061d7d98  echomixer.png
+4c10f8d250a86bdb3ea138488aec8fc4  envy24control.desktop
+3a1a195f2b9641f68651e3d312e5476f  envy24control.png
+2ab2677de89c5fd0e769b212f206101a  alsa-tools-1.0.15-pruned.tar.bz2