diff --git a/cdrdao.spec b/cdrdao.spec
index 9e90fb5..8c06451 100644
--- a/cdrdao.spec
+++ b/cdrdao.spec
@@ -1,20 +1,23 @@
-Summary: Writes audio CD-Rs in disk-at-once (DAO) mode.
+Summary: Writes audio CD-Rs in disk-at-once (DAO) mode
 Name: cdrdao
 Version: 1.2.2
-Release: 1
+Release: 2
 License: GPL
 Group: Applications/Multimedia
 URL: http://cdrdao.sourceforge.net/
 Source: http://easynews.dl.sourceforge.net/sourceforge/cdrdao/%{name}-%{version}.tar.bz2
-Source1: xcdrdao.desktop
 
 Patch1: mkisofs-changelog.patch 
 Patch9: cdrdao-1.1.7-endianness.patch
 Patch23: cdrtools-2.01a27-silly-warnings.patch
 Patch30: cdrtools-2.0-O_EXCL.patch
 
-BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: libvorbis-devel >= 1.0
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+# Only for gcdmaster
+#BuildRequires: libvorbis-devel >= 1.0
+
+BuildRequires: libpng-devel
 
 # Only exclude s390
 ExcludeArch: s390 s390x
@@ -36,15 +39,14 @@ chmod a+rX -R .
 
 %build
 %configure --prefix=%{_prefix}\
-	    --without-xdao --without-lame \
-            --with-pcctsbin=%{_prefix}/bin \
-            --with-pcctsinc=%{_prefix}/include/pccts 
-make
+	--without-xdao --without-lame 
+
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%makeinstall
+make install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -58,11 +60,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/*/*
 
 %changelog
+* Tue Feb 27 2007 Harald Hoyer <harald@redhat.com> - 1.2.2-2
+- fixed specfile issues (bug #225639)
+
 * Wed Jan 24 2007 Harald Hoyer <harald@redhat.com> - 1.2.2-1
 - version 1.2.2
 - built without cdrecord-devel now
 
-* Mon Aug 21 2006 Harald Hoyer <harald@redhat.com> - 1.2.1-1.1
+* Mon Aug 21 2006 Harald Hoyer <harald@redhat.com> - 1.2.1-2
 - rebuild with new/old cdrtools
 
 * Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 1.2.1-1.1
@@ -234,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon May 8 2000 Tim Powers <timp@redhat.com>
 - use applnk for dirs
-- use %configure
+- use %%configure
 - remove redundant defines
 - rebuilt for 7.0