diff --git a/syslog-ng.spec b/syslog-ng.spec
index bee24ff..98488b4 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,12 +5,12 @@
 
 Name: syslog-ng
 Version: 3.2.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
 License: GPLv2+
-Url: http://www.balabit.com/products/syslog_ng/
+Url: http://www.balabit.com/network-security/syslog-ng
 Source0: http://www.balabit.com/downloads/files?path=/syslog-ng/sources/%{version}/source/%{name}_%{version}.tar.gz
 Source1: syslog-ng.conf
 Source2: syslog-ng.service
@@ -84,6 +84,7 @@ developing applications that use %{name}.
     --includedir=%{_includedir} \
     --sysconfdir=%{_sysconfdir}/%{name} \
     --localstatedir=%{_sharedstatedir}/%{name} \
+    --datadir=%{_datadir}/%{name} \
     --with-module-dir=/%{_lib}/%{name} \
     --enable-ipv6 \
     --enable-tcp-wrapper \
@@ -123,6 +124,11 @@ make DESTDIR=%{buildroot} install
 # create the local state dir
 %{__install} -d -m 755 %{buildroot}/%{_sharedstatedir}/%{name}
 
+# install the main library header files
+%{__install} -d -m 755 %{buildroot}%{_includedir}/%{name}
+%{__install} -p -m 644 config.h %{buildroot}%{_includedir}/%{name}
+%{__install} -p -m 644 lib/*.h %{buildroot}%{_includedir}/%{name}
+
 # install vim files
 %{__install} -d -m 755 %{buildroot}%{_datadir}/%{name}
 %{__install} -p -m 644 contrib/syslog-ng.vim %{buildroot}%{_datadir}/%{name}
@@ -135,7 +141,7 @@ done
 
 ldconfig -N -n %{buildroot}/%{_lib}
 
-find %{buildroot} -name *.la -exec rm -f '{}' \;
+find %{buildroot} -name "*.la" -exec rm -f {} \;
 
 
 %check
@@ -219,25 +225,34 @@ fi
 %{_bindir}/update-patterndb
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/%{name}/*.so
-%{_datadir}/%{name}
+
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/syslog-ng.vim
+%ghost %{_datadir}/vim/
 
 # uhm, some better places for those?
-%{_datadir}/xsd
+%{_datadir}/%{name}/xsd/
 
 %{_mandir}/man1/loggen.1*
 %{_mandir}/man1/pdbtool.1*
 %{_mandir}/man1/syslog-ng-ctl.1*
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
-%ghost %{_datadir}/vim/
 
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libsyslog-ng.so
-%{_datadir}/include/scl
+%{_includedir}/%{name}/
+# scl files
+%{_datadir}/%{name}/include/
 
 
 %changelog
+* Mon May 16 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-3
+- Updated the homepage URL
+- Syslog-ng data directory in %%{_datadir}/%%{name}
+- Include the main library header files in the devel subpackage
+
 * Thu May 12 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-2
 - No need to create the directory /etc/syslog-ng in the install section
 - Enable the test suite (but excluding the SQL and SSL tests)