diff --git a/alsa-tools.spec b/alsa-tools.spec
index b08bdc5..3fa0efd 100644
--- a/alsa-tools.spec
+++ b/alsa-tools.spec
@@ -2,7 +2,6 @@ Summary: 	The ALSA Tools
 Name: 		alsa-tools
 Version: 	1.0.4
 Release: 	1.1
-Epoch: 		0
 License: 	GPL
 Group: 		Applications/Multimedia
 URL: 		http://www.alsa-project.org/
@@ -10,7 +9,7 @@ Source0: 	%{name}-%{version}.tar.bz2
 BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	gtk+-devel alsa-driver fltk-devel automake
 BuildRequires:	alsa-lib-devel >= 0:1.0.4
-Buildrequires:  desktop-file-utils
+Buildrequires:	desktop-file-utils
 
 %package firmware
 Summary: 	Alsa-Tool to upload the firmware (needed for some soundcards)
@@ -18,8 +17,6 @@ Group: 		Applications/System
 Requires:	hotplug alsa-firmware
 
 
-# -----------------------------------------------------------------------------
-
 %description
 This package contains several tools which can be used together with
 ALSA-Drivers and -Libs. Some of this tools are only needed for special
@@ -42,8 +39,6 @@ vxloader     - for Digigram VX soundcards
 usx2yloader  - Second Phase Firmware loader for Tascam USX2Y USB soundcards
 
 
-# -----------------------------------------------------------------------------
-
 %prep
 echo "
 --------------------------------------------------------------
@@ -51,9 +46,8 @@ Hasn't been built nor updated since FC1.
 Needs decision on whether to drop it.
 --------------------------------------------------------------" > /dev/null
 exit 1
-%setup -q -n %{name}-%{version}
+%setup -q
 
-# -----------------------------------------------------------------------------
 
 %build
 mv seq/sbiload . ; rmdir seq
@@ -64,7 +58,6 @@ do
   cd ..
 done
 
-# -----------------------------------------------------------------------------
 
 %install
 %{__rm} -rf $RPM_BUILD_ROOT
@@ -72,20 +65,20 @@ done
 [ -f debugsources.list ] && rm debugsources.list
 
 for i in *
-do 
+do
    case $i in
       hdspconf)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       hdspmixer)
-	(cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
+        (cd $i ; %makeinstall pixmapdir=${RPM_BUILD_ROOT}%{_datadir}/pixmaps desktopdir=${RPM_BUILD_ROOT}%{_datadir}/applications ) || exit 1
         ;;
       usx2yloader)
-	(cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
+        (cd $i ; %makeinstall hotplugdir=${RPM_BUILD_ROOT}%{_sysconfdir}/hotplug/usb) || exit 1
         ;;
       *) (cd $i ; %makeinstall) || exit 1
    esac
-   if [[ -s "${i}"/README ]] 
+   if [[ -s "${i}"/README ]]
    then
       if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
       then
@@ -93,7 +86,7 @@ do
       fi
       cp "${i}"/README "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
-   if [[ -s "${i}"/COPYING ]] 
+   if [[ -s "${i}"/COPYING ]]
    then
       if [[ ! -d "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}" ]]
       then
@@ -102,7 +95,7 @@ do
       cp "${i}"/COPYING "${RPM_BUILD_ROOT}%{_docdir}/%{name}-%{version}/${i}"
    fi
 
-  
+
 done
 
 for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
@@ -113,12 +106,10 @@ for f in ${RPM_BUILD_ROOT}%{_datadir}/applications/*.desktop; do
       $f
 done
 
-# -----------------------------------------------------------------------------
 
 %clean
 %{__rm} -rf $RPM_BUILD_ROOT
 
-# -----------------------------------------------------------------------------
 
 %files
 %defattr(-,root,root,-)
@@ -162,7 +153,6 @@ done
 %{_bindir}/usx2yloader
 %{_bindir}/vxloader
 
-# -----------------------------------------------------------------------------
 
 %changelog
 * Sat Apr 03 2004 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 0:1.0.4-0.fdr.1