diff --git a/.cvsignore b/.cvsignore
index e1f7eff..d4ca659 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-alsa-plugins-1.0.20.tar.bz2
+alsa-plugins-1.0.21.tar.bz2
diff --git a/alsa-plugins.spec b/alsa-plugins.spec
index 5512a77..28ee1fe 100644
--- a/alsa-plugins.spec
+++ b/alsa-plugins.spec
@@ -1,5 +1,5 @@
 Name:           alsa-plugins
-Version:        1.0.20
+Version:        1.0.21
 Release:        2%{?dist}
 Summary:        The Advanced Linux Sound Architecture (ALSA) Plugins
 # All packages are LGPLv2+ with the exception of samplerate which is GPLv2+
@@ -15,6 +15,7 @@ Source5:        upmix.conf
 Source6:        vdownmix.conf
 Source7:        pulse-default.conf
 Source8:        arcamav.conf
+Source9:        maemo.conf
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  alsa-lib-devel
@@ -26,7 +27,8 @@ functionality to the Linux operating system.
 This package includes plugins for ALSA.
 
 %package jack
-Requires:       jack-audio-connection-kit, alsa-utils
+Requires:       alsa-utils
+Requires:       jack-audio-connection-kit
 BuildRequires:  jack-audio-connection-kit-devel
 Summary:        Jack PCM output plugin for ALSA
 Group:          System Environment/Libraries
@@ -50,7 +52,8 @@ ALSA native apps can run on OSS drivers.
 This plugin provides the PCM type "oss".
 
 %package pulseaudio
-Requires:       pulseaudio, alsa-utils
+Requires:       alsa-utils
+Requires:       pulseaudio
 BuildRequires:  pulseaudio-lib-devel
 Summary:        Alsa to PulseAudio backend
 Group:          System Environment/Libraries
@@ -121,12 +124,24 @@ The rate plugin is an external rate converter using the Speex resampler
 (aka Public Parrot Hack) by Jean-Marc Valin. The pcm plugin provides
 pre-processing of a mono stream like denoise using libspeex DSP API.
 
+%package maemo
+BuildRequires:  alsa-lib-devel = %{version}
+BuildRequires:  dbus-devel
+Summary:        Maemo plugin for ALSA
+Group:          System Environment/Libraries
+License:        LGPLv2+
+%description maemo
+This plugin converts the ALSA API over PCM task nodes protocol. In this way,
+ALSA native applications can run over DSP Gateway and use DSP PCM task nodes.
+
 %prep
 %setup -q -n %{name}-%{version}%{?prever}
 
 %build
 %configure --disable-static \
-           --with-speex=lib
+           --with-speex=lib \
+           --enable-maemo-plugin \
+           --enable-maemo-resource-manager
 make %{?_smp_mflags}
 
 %install
@@ -134,20 +149,21 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
-install -m 644 %SOURCE1 %SOURCE2 \
-               %SOURCE3 %SOURCE4 \
-               %SOURCE5 %SOURCE6 \
+install -m 644 %SOURCE1 \
+               %SOURCE2 \
+               %SOURCE3 \
+               %SOURCE4 \
+               %SOURCE5 \
+               %SOURCE6 \
                %SOURCE8 \
+               %SOURCE9 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa/pcm
+# pulseaudio configuration file
 install -m 644 %SOURCE7 \
                ${RPM_BUILD_ROOT}%{_sysconfdir}/alsa
 
 find $RPM_BUILD_ROOT -name "*.la" -exec rm {} \;
 
-# Removing the maemo plugins
-find $RPM_BUILD_ROOT \( -name libasound_module_ctl_dsp_ctl.so -o \
-                        -name libasound_module_pcm_alsa_dsp.so \) -exec rm {} \;
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -223,8 +239,32 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/alsa-lib/libasound_module_rate_speexrate_best.so
 %{_libdir}/alsa-lib/libasound_module_rate_speexrate_medium.so
 
+%files maemo
+%defattr(-,root,root,-)
+%doc COPYING COPYING.GPL doc/README-maemo
+%config(noreplace) %{_sysconfdir}/alsa/pcm/maemo.conf
+%{_libdir}/alsa-lib/libasound_module_ctl_dsp_ctl.so
+%{_libdir}/alsa-lib/libasound_module_pcm_alsa_dsp.so
+
 
 %changelog
+* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-2
+- Added missing dbus-devel dependency to maemo subpackage
+
+* Mon Sep 7 2009 Eric Moret <eric.moret@gmail.com> - 1.0.21-1
+- Updated to 1.0.21
+- Patch clean up
+- Added maemo subpackage
+
+* Tue Aug 4 2009 Lennart Poettering <lpoetter@redhat.com> - 1.0.20-5
+- Add a couple of more clean up patches for the pulse plugin
+
+* Fri Jul 31 2009 Lennart Poettering <lpoetter@redhat.com> - 1.0.20-4
+- Add a couple of clean up patches for the pulse plugin
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.20-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Jun 24 2009 Eric Moret <eric.moret@gmail.com> - 1.0.20-2
 - Added speex subpackage
 - Removed ascii-art from jack's plugin description
diff --git a/maemo.conf b/maemo.conf
new file mode 100644
index 0000000..737890f
--- /dev/null
+++ b/maemo.conf
@@ -0,0 +1,13 @@
+# PCM
+pcm.!default {
+	type alsa_dsp
+	playback_device_file ["/dev/dsptask/pcm2"]
+	recording_device_file ["/dev/dsptask/pcm_rec"]
+}
+
+# Mixer
+ctl.!default {
+	type dsp_ctl
+	playback_devices ["/dev/dsptask/pcm2"]
+	recording_devices ["/dev/dsptask/pcm_rec"]
+}
diff --git a/sources b/sources
index 0bce8c2..c947667 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-819c4f21e3e913eacefd32993a8fbed7  alsa-plugins-1.0.20.tar.bz2
+392d016c0948c54978c0505f24271e01  alsa-plugins-1.0.21.tar.bz2