diff --git a/libssh.spec b/libssh.spec
index 77b0612..7094db7 100644
--- a/libssh.spec
+++ b/libssh.spec
@@ -1,38 +1,33 @@
 Name:           libssh
 Version:        0.5.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A library implementing the SSH2 protocol (0xbadc0de version)
-
-Group:          System Environment/Libraries
 License:        LGPLv2+
-#original URL:	http://0xbadc0de.be/?part=libssh
 URL:            http://www.libssh.org/
+
 Source0:        https://red.libssh.org/attachments/download/41/libssh-0.5.4.tar.gz
 Source1:        https://red.libssh.org/attachments/download/42/libssh-0.5.4.tar.asc
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
+BuildRequires:  cmake
 BuildRequires:  openssl-devel
 BuildRequires:  zlib-devel   
-BuildRequires:  cmake
 
 %description
-The ssh library was designed to be used by programmers needing a
-working SSH implementation by the mean of a library. The complete
-control of the client is made by the programmer. With libssh, you can
-remotely execute programs, transfer files, use a secure and transparent
-tunnel for your remote programs. With its Secure FTP implementation,
-you can play with remote files easily, without third-party programs
-others than libcrypto (from openssl).
-
+The ssh library was designed to be used by programmers needing a working SSH
+implementation by the mean of a library. The complete control of the client is
+made by the programmer. With libssh, you can remotely execute programs, transfer
+files, use a secure and transparent tunnel for your remote programs. With its
+Secure FTP implementation, you can play with remote files easily, without
+third-party programs others than libcrypto (from openssl).
 
 %package devel
 Summary:         Development files for %{name}
 Group:           Development/Libraries
-Requires:         %{name} = %{version}-%{release}
+Requires:        %{name}%{?_isa} = %{version}-%{release}
 
 %description devel
-The %{name}-devel package contains libraries and header files for
-developing applications that use %{name}.
+The %{name}-devel package contains libraries and header files for developing
+applications that use %{name}.
 
 %prep
 %setup -q
@@ -44,33 +39,30 @@ cd obj
 make
 
 %install
-rm -rf $RPM_BUILD_ROOT
 cd obj
-make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} + 
-chmod 644 $RPM_BUILD_ROOT/usr/include/libssh/*
-install -d $RPM_BUILD_ROOT/usr/share
-mv $RPM_BUILD_ROOT/%{_libdir}/pkgconfig $RPM_BUILD_ROOT/usr/share
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
+find %{buildroot} -name '*.la' -delete
+#chmod 644 %{buildroot}%{_includedir}/libssh/*
+install -d %{buildroot}%{_datadir}
+mv %{buildroot}/%{_libdir}/pkgconfig %{buildroot}/usr/share
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
 %doc AUTHORS BSD ChangeLog COPYING README
 %{_libdir}/*.so.*
 
 %files devel
-%defattr(-,root,root,-)
+%{_datadir}/pkgconfig/*.pc
 %{_includedir}/*
 %{_libdir}/*.so
-%{_usr}/share/pkgconfig/*.pc
 
 %changelog
+* Mon Jun 10 2013 Simone Caronni <negativo17@gmail.com> - 0.5.4-3
+- Clean up SPEC file and fix rpmlint complaints.
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.5.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild