diff --git a/lftp.spec b/lftp.spec
index ebab38e..a3435b3 100644
--- a/lftp.spec
+++ b/lftp.spec
@@ -1,14 +1,13 @@
 Summary: 	A sophisticated file transfer program
 Name: 		lftp 
 Version: 	3.5.10
-Release: 	1%{?dist}
+Release: 	2%{?dist}
 License: 	GPL
 Group: 		Applications/Internet
-Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.bz2
+Source0: 	ftp://ftp.yar.ru/lftp/lftp-%{version}.tar.gz
 URL: 		http://lftp.yar.ru/
-BuildRoot: 	%{_tmppath}/%{name}-%{version}-root
-BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool
-Requires:    	perl-String-CRC32
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: 	ncurses-devel, openssl-devel, pkgconfig, readline-devel, autoconf, automake, libtool, gettext
 
 %description
 LFTP is a sophisticated ftp/http file transfer program. Like bash, it has job
@@ -16,6 +15,13 @@ control and uses the readline library for input. It has bookmarks, built-in
 mirroring, and can transfer several files in parallel. It is designed with
 reliability in mind.
 
+%package devel
+Summary: Headers and static libraries for lftp development
+Group: Development/Libraries
+
+%description devel
+This package contains the header files, and static libraries for building lftp.
+
 %prep
 %setup -q
 
@@ -27,7 +33,7 @@ fi
 LDFLAGS="-L`pwd`/src/.libs $LDFLAGS"; export LDFLAGS
 %configure --with-modules --disable-static --with-openssl=/usr --with-debug
 export tagname=CC
-make LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool %{?_smp_mflags}
 
 %{?!DEBUG:  %define DEBUG 0}
 %if %{DEBUG}
@@ -37,7 +43,7 @@ make LIBTOOL=%{_bindir}/libtool
 %install
 rm -rf $RPM_BUILD_ROOT
 export tagname=CC
-%makeinstall LIBTOOL=%{_bindir}/libtool
+make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install
 rm -f $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.la
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/*
 chmod 0755 $RPM_BUILD_ROOT%{_libdir}/lftp/%{version}/*.so
@@ -47,7 +53,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-jobs.*a
 rm -f $RPM_BUILD_ROOT%{_libdir}/liblftp-tasks.*a
 %find_lang %{name}
 %if %{DEBUG}
-/usr/lib/rpm/brp-compress
+%{_libdir}/rpm/brp-compress
 exit 0
 %endif
 :;
@@ -55,17 +61,26 @@ exit 0
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add lftp
+/sbin/ldconfig
+
+%postun
+if [ "$1" = 0 ]; then
+/sbin/chkconfig --del lftp
+/sbin/ldconfig
+fi
+exit 0
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc BUGS COPYING ChangeLog FAQ FEATURES README* NEWS THANKS TODO
-%config %{_sysconfdir}/lftp.conf
+%config(noreplace) %{_sysconfdir}/lftp.conf
 %{_bindir}/*
 %{_mandir}/*/*
 %{_datadir}/lftp
 %dir %{_libdir}/lftp
 %dir %{_libdir}/lftp/%{version}
-%{_libdir}/liblftp-jobs*
-%{_libdir}/liblftp-tasks*
 %{_libdir}/lftp/%{version}/cmd-mirror.so
 %{_libdir}/lftp/%{version}/cmd-sleep.so
 %{_libdir}/lftp/%{version}/liblftp-network.so
@@ -77,7 +92,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lftp/%{version}/proto-sftp.so
 %{_libdir}/lftp/%{version}/liblftp-getdate.so
 
+%files devel
+%defattr(-,root,root,-)
+%{_libdir}/liblftp-jobs*
+%{_libdir}/liblftp-tasks*
+
 %changelog
+* Wed Apr 04 2007 Maros Barabas <mbarabas@redhat.com> - 3.5.10-2
+- Merge review fix
+- Resolves #225984
+
 * Wed Apr 04 2007 Maros Barabas <mbarabas@redhat.com> - 3.5.10
 - Upgrade to 3.5.10 from upstream