diff --git a/recode.spec b/recode.spec
index 3f8759c..4431660 100644
--- a/recode.spec
+++ b/recode.spec
@@ -1,15 +1,15 @@
-Summary: Conversion between character sets and surfaces.
+Summary: Conversion between character sets and surfaces
 Name: recode
 Version: 3.6
-Release: 17
+Release: 18%{?dist}
 License: GPL
 Group: Applications/File
-Source: ftp://ftp.iro.umontreal.ca/pub/recode/recode-%{version}.tar.gz
-Patch: recode.patch
+Source: http://recode.progiciels-bpi.ca/archives/recode-%{version}.tar.gz
+Patch0: recode.patch
 Patch1: recode-3.6-getcwd.patch
-Url: http://www.iro.umontreal.ca/contrib/recode/HTML/
-Prereq: /sbin/install-info /sbin/ldconfig
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+Url: http://recode.progiciels-bpi.ca/
+Requires: /sbin/install-info /sbin/ldconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
 The `recode' converts files between character sets and usages.
@@ -20,7 +20,7 @@ characters or fall back on approximations.  Most RFC 1345 character sets
 are supported.
 
 %package devel
-Summary: Header files and static libraries for development using recode.
+Summary: Header files and static libraries for development using recode
 Group: Development/Libraries
 Requires: %{name} = %{version}
 
@@ -34,12 +34,12 @@ are supported.
 
 %prep
 %setup -q
-%patch -p1
+%patch0 -p1
 %patch1 -p1 -b .getcwd
 
 %build
 %configure
-make
+make %{?_smp_mflags}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -47,8 +47,6 @@ rm -rf $RPM_BUILD_ROOT
 %makeinstall
 %find_lang %{name}
 
-gzip -9nf ${RPM_BUILD_ROOT}%{_infodir}/recode.info*
-
 # remove unpackaged file from the buildroot
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 
@@ -83,6 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %changelog
+* Fri Aug 26 2005 Zoltan Kota <z.kota[AT]gmx.net> 3.6-18
+- add dist tag
+- specfile cleanup
+
 * Thu May 26 2005 Bill Nottingham <notting@redhat.com> 3.6-17
 - rebuild for Extras