diff --git a/.cvsignore b/.cvsignore
index c5e07a2..64b0623 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-dvdisaster-0.65.tar.bz2
+dvdisaster-0.66.tar.bz2
diff --git a/dvdisaster.desktop b/dvdisaster.desktop
deleted file mode 100644
index 603739d..0000000
--- a/dvdisaster.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=DVDisaster
-Comment=CD/DVD media data loss/scratch/aging protection
-Comment[de]=Schutz für CD/DVD Medien gegen Datenverlust durch Alterung oder Kratzer
-Exec=@NAME@
-Icon=@NAME@.png
-Terminal=false
-Type=Application
-Categories=GTK;Application;System;
diff --git a/dvdisaster.spec b/dvdisaster.spec
index bea851b..06968bc 100644
--- a/dvdisaster.spec
+++ b/dvdisaster.spec
@@ -1,12 +1,11 @@
 Name: dvdisaster
-Summary: CD/DVD media data loss/scratch/aging protection
-Version: 0.65
-Release: 2%{?dist}
+Summary: Additional error protection for CD/DVD media
+Version: 0.66
+Release: 1%{?dist}
 Group: Applications/Archiving
 License: GPL 
 URL: http://www.dvdisaster.com
 Source0: http://download.berlios.de/dvdisaster/dvdisaster-%{version}.tar.bz2
-Source1: dvdisaster.desktop
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,10 +33,10 @@ degli errori che saranno poi utilizzati per recuperare i settori illeggibili
 se il supporto dovesse danneggiarsi col tempo.
 
 %description -l cs
-%{name} poskytuje dodatečné zabezpečení proti ztrátě dat
-na CD a DVD médiích způsobené stárnutím nebo poškrábáním.
-Vytváří data oprav chyb, která jsou použita k obnově nečitelných
-sektorů, pokud se disk později poškodí.
+%{name} poskytuje dodatečnou ochranu proti ztrátě dat na médiích CD a DVD
+způsobených poškrábáním nebo stárnutím. Vytváří data oprav chyb, která
+jsou použita pro obnovu nečitelných sektorů, pokud se disk později
+poškodí.
 
 
 %prep
@@ -46,41 +45,35 @@ sektorů, pokud se disk později poškodí.
 
 %build
 
-%configure
+%configure	\
+	--docdir=%{_docdir} \
+	--docsubdir=%{name}-%{version} \
+	--localedir=%{_datadir}/locale \
+	--with-nls=yes
+
 #make show
 
-make %{?_smp_mflags} \
-	PREFIX=%{_prefix} \
-	BINDIR=%{_bindir} \
-	MANDIR=%{_mandir} \
-	LOCALEDIR=%{_prefix}/share/locale \
-	DOCDIR=%{_docdir} \
-	DOCSUBDIR=%{_docdir}/%{name}-%{version}
+make %{?_smp_mflags}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-make install \
+make install	\
 	BINDIR=$RPM_BUILD_ROOT%{_bindir} \
 	DOCSUBDIR=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} \
 	MANDIR=$RPM_BUILD_ROOT%{_mandir} \
 	LOCALEDIR=$RPM_BUILD_ROOT%{_prefix}/share/locale
 
-for man in `find $RPM_BUILD_ROOT%{_mandir} -type f -print`
-do
-    sed -i "s:%{_docdir}/dvdisaster-doc:%{_docdir}/%{name}-%{version}:g" $man
-done
+rm -f $RPM_BUILD_ROOT%{_bindir}/*-uninstall.sh
 
 install -d $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -p -m644 icons/create.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
-
-sed 's/@NAME@/%{name}/g' %{SOURCE1} >%{name}.desktop
+install -p -m644 contrib/dvdisaster48.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 
 desktop-file-install --vendor fedora			\
 	--dir ${RPM_BUILD_ROOT}%{_datadir}/applications	\
 	--add-category X-Fedora				\
-	%{name}.desktop
+	contrib/%{name}.desktop
 	
 %find_lang %{name}
 
@@ -113,8 +106,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Feb 14 2006 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.65-2
-- rebuild for FC5
+* Thu Mar 30 2006 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.66-1
+- upgrade to 0.66
+- spec file changes/cleanups, merged from a skeleton now included upstream
+- still specify dirs explicitly on install due to typo in GNUmakefile
+- remove unneeded uninstall.sh script after install
 
 * Tue Jan 31 2006 Dmitry Butskoy <Dmitry@Butskoy.name> - 0.65-1
 - upgrade to 0.65
diff --git a/sources b/sources
index a98787d..f687cd2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-bcab797d77656ca6c672cb646b9c7971  dvdisaster-0.65.tar.bz2
+0bae5ab6bad8c4613d1250609ed1fbab  dvdisaster-0.66.tar.bz2