diff --git a/man-pages-fr.spec b/man-pages-fr.spec
index c9f291c..83ade7f 100644
--- a/man-pages-fr.spec
+++ b/man-pages-fr.spec
@@ -1,14 +1,14 @@
 Summary:	French man pages from the Linux Documentation Project
 Name:		man-pages-fr
 Version:	2.39
-Release:	7%{?dist}
+Release:	8%{?dist}
 License:	Distributable
 Group:		Documentation
 URL:		http://manpagesfr.free.fr/
 Source0:	http://manpagesfr.free.fr/download/%{name}-%{version}.tar.bz2
 Source1:	http://www.delafond.org/traducmanfr/mansupfr.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildArch:      noarch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildArch: noarch
 
 %description
 Manual pages from the Linux Documentation Project, translated into French. Also
@@ -35,22 +35,22 @@ done
 
 # gawk haven't coding, but it's in latin1
 for i in man?/*; do
-  CODING=`file -i ${i} | cut -d"=" -f2`;
-    if [[ "${CODING}" == "utf-8" ||  "${CODING}" == "us-ascii" || "${CODING}" == "iso-8859-1" ]]
-    then
-      if [ "${CODING}" != "UTF-8" ]
-      then
-	iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
-        install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-	rm -rf ${i}.new
-      else
-	install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-      fi
-    else 
-	iconv -f LATIN1 -t UTF-8 < ${i} > ${i}.new
-        install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
-        rm -rf ${i}.new
-    fi
+	CODING=`file -i ${i} | cut -d"=" -f2`;
+		if [[ "${CODING}" == "utf-8" ||  "${CODING}" == "us-ascii" || "${CODING}" == "iso-8859-1" ]]
+		then
+			if [ "${CODING}" != "UTF-8" ]
+			then
+				iconv -f ${CODING} -t UTF-8 < ${i} > ${i}.new
+				install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+				rm -rf ${i}.new
+			else
+				install -m 0644 ${i} $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+			fi
+		else 
+			iconv -f LATIN1 -t UTF-8 < ${i} > ${i}.new
+			install -m 0644 ${i}.new $RPM_BUILD_ROOT%{_mandir}/fr/${i}
+			rm -rf ${i}.new
+		fi
 done
 
 ##make install-install DESTDIR=$RPM_BUILD_ROOT
@@ -101,10 +101,13 @@ rm -fr $RPM_BUILD_ROOT
 %files
 %defattr(0644,root,root,0755)
 %doc changements changements.anciens LISEZ_MOI LISEZ_MOI-mansupfr
-##%doc Changements Changements.anciens Lisez_moi
 %{_mandir}/fr/
 
 %changelog
+* Mon Mar 05 2007 Marcela Maslanova <mmaslano@redhat.com> 2.39-8
+- merge review
+- rhbz#230061
+
 * Mon Oct 13 2006 Marcela Maslanova <mmaslano@redhat.com> 2.39-7
 - rebuilt