diff --git a/libffado-gcc47.patch b/libffado-gcc47.patch
index 426ff97..74b6cf4 100644
--- a/libffado-gcc47.patch
+++ b/libffado-gcc47.patch
@@ -64,3 +64,94 @@ diff -rupN libffado-2.1.0.old/support/dbus/test-dbus.cpp libffado-2.1.0/support/
  #include <signal.h>
  
  #include "controlclient.h"
+diff -rupN libffado-2.1.0.old/tests/test-dice-eap.cpp libffado-2.1.0/tests/test-dice-eap.cpp
+--- libffado-2.1.0.old/tests/test-dice-eap.cpp	2010-01-04 17:20:56.000000000 -0500
++++ libffado-2.1.0/tests/test-dice-eap.cpp	2012-03-22 22:00:44.139732286 -0400
+@@ -45,6 +45,7 @@ using namespace Dice;
+ #include <iostream>
+ #include <cstdlib>
+ #include <cstring>
++#include <unistd.h>
+ 
+ #include <signal.h>
+ int run;
+diff -rupN libffado-2.1.0.old/tests/test-fw410.cpp libffado-2.1.0/tests/test-fw410.cpp
+--- libffado-2.1.0.old/tests/test-fw410.cpp	2008-01-20 05:29:17.000000000 -0500
++++ libffado-2.1.0/tests/test-fw410.cpp	2012-03-22 22:00:15.473867173 -0400
+@@ -27,6 +27,7 @@
+ #include <argp.h>
+ #include <stdlib.h>
+ #include <iostream>
++#include <unistd.h>
+ 
+ using namespace std;
+ 
+diff -rupN libffado-2.1.0.old/tests/test-ieee1394service.cpp libffado-2.1.0/tests/test-ieee1394service.cpp
+--- libffado-2.1.0.old/tests/test-ieee1394service.cpp	2009-12-19 11:12:53.000000000 -0500
++++ libffado-2.1.0/tests/test-ieee1394service.cpp	2012-03-22 22:03:36.150915502 -0400
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <endian.h>
++#include <unistd.h>
+ 
+ #include <getopt.h>
+ 
+diff -rupN libffado-2.1.0.old/tests/test-ipcringbuffer.cpp libffado-2.1.0/tests/test-ipcringbuffer.cpp
+--- libffado-2.1.0.old/tests/test-ipcringbuffer.cpp	2008-05-15 00:38:31.000000000 -0400
++++ libffado-2.1.0/tests/test-ipcringbuffer.cpp	2012-03-22 22:05:04.425493246 -0400
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ using namespace Util;
+ 
+diff -rupN libffado-2.1.0.old/tests/test-messagequeue.cpp libffado-2.1.0/tests/test-messagequeue.cpp
+--- libffado-2.1.0.old/tests/test-messagequeue.cpp	2008-05-29 04:24:21.000000000 -0400
++++ libffado-2.1.0/tests/test-messagequeue.cpp	2012-03-22 22:06:16.287149558 -0400
+@@ -30,6 +30,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ #include <semaphore.h>
+ #include <cstring>
+diff -rupN libffado-2.1.0.old/tests/test-scs.cpp libffado-2.1.0/tests/test-scs.cpp
+--- libffado-2.1.0.old/tests/test-scs.cpp	2009-12-23 14:10:49.000000000 -0500
++++ libffado-2.1.0/tests/test-scs.cpp	2012-03-22 22:12:26.287380774 -0400
+@@ -477,8 +477,8 @@ main(int argc, char **argv)
+         }
+         #endif
+ 
+-        BridgeMapIterator it = seqport2bridgemap.find(portNumber);
+-        if(it == seqport2bridgemap.end()) {
++        BridgeMapIterator it2 = seqport2bridgemap.find(portNumber);
++        if(it2 == seqport2bridgemap.end()) {
+             seqport2bridgemap[portNumber] = bridge;
+         } else {
+             debugError("BUG: port already present in bridge map, duplicate port.\n");
+diff -rupN libffado-2.1.0.old/tests/test-shm.cpp libffado-2.1.0/tests/test-shm.cpp
+--- libffado-2.1.0.old/tests/test-shm.cpp	2008-05-15 00:38:31.000000000 -0400
++++ libffado-2.1.0/tests/test-shm.cpp	2012-03-22 22:13:47.973990443 -0400
+@@ -29,6 +29,7 @@
+ #include <stdlib.h>
+ #include <iostream>
+ #include <signal.h>
++#include <unistd.h>
+ 
+ using namespace Util;
+ 
+diff -rupN libffado-2.1.0.old/tests/test-streamdump.cpp libffado-2.1.0/tests/test-streamdump.cpp
+--- libffado-2.1.0.old/tests/test-streamdump.cpp	2008-05-09 08:02:40.000000000 -0400
++++ libffado-2.1.0/tests/test-streamdump.cpp	2012-03-22 22:14:57.222659592 -0400
+@@ -27,6 +27,7 @@
+ 
+ #include <argp.h>
+ #include <stdlib.h>
++#include <unistd.h>
+ #include <iostream>
+ 
+ using namespace std;
diff --git a/libffado.spec b/libffado.spec
index 3f0037a..70036fd 100644
--- a/libffado.spec
+++ b/libffado.spec
@@ -5,7 +5,7 @@
 Summary:        Free firewire audio driver library
 Name:           libffado
 Version:        2.1.0
-Release:        0.6.20111030.svn2000%{?dist}
+Release:        0.7.20111030.svn2000%{?dist}
 # src/libutil/float_cast.h is LGPLv2+.
 # The rest is (GPLv2 or GPLv3)
 License:        LGPLv2+ and (GPLv2 or GPLv3)
@@ -24,7 +24,6 @@ Patch0:         libffado-api-doc-only.patch
 # Fix gcc-4.7 compilation error
 # http://subversion.ffado.org/ticket/344
 Patch1:         libffado-gcc47.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  dbus-c++-devel
 BuildRequires:  dbus-devel
@@ -82,12 +81,15 @@ Applications and utilities for use with libffado.
 
 cp -a %{SOURCE1} .
 
+# We don't want to install all tests
+sed -i '/Install/d' tests/{,*/}SConscript
+
 %build
 scons %{?_smp_mflags} \
       COMPILE_FLAGS="%{optflags} -ffast-math" \
       PREFIX=%{_prefix} \
       LIBDIR=%{_libdir} \
-      BUILD_TESTS=0
+      BUILD_TESTS=1
 
 
 %install
@@ -96,11 +98,14 @@ scons DESTDIR=%{buildroot} install
 # We need to install the xdg stuff manually
 mkdir -p %{buildroot}%{_datadir}/applications
 desktop-file-install --dir %{buildroot}%{_datadir}/applications \
+   --add-category="Settings" \
    support/xdg/ffado.org-ffadomixer.desktop
 mkdir -p %{buildroot}%{_datadir}/icons/hicolor/64x64/apps
 ln -s ../../../../libffado/icons/hi64-apps-ffado.png \
     %{buildroot}%{_datadir}/icons/hicolor/64x64/apps/ffado.png
 
+# Install ffado-test RHBZ#805940
+install -m 755 tests/ffado-test %{buildroot}%{_bindir}
 
 %post -p /sbin/ldconfig
 
@@ -143,6 +148,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{python_sitelib}/ffado/
 
 %changelog
+* Thu Mar 22 2012 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 2.1.0-0.7.20111030.svn2000
+- Include the ffado-test executable RHBZ#805940
+- Fix .desktop file warning
+
 * Tue Feb 28 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.0-0.6.20111030.svn2000
 - Rebuilt for c++ ABI breakage