diff --git a/syslog-ng-3.2.4-disable-ssl-tests.patch b/syslog-ng-3.2.4-disable-ssl-tests.patch
new file mode 100644
index 0000000..7c29736
--- /dev/null
+++ b/syslog-ng-3.2.4-disable-ssl-tests.patch
@@ -0,0 +1,18 @@
+diff -ruN syslog-ng-3.2.4/tests/functional/func_test.py syslog-ng-3.2.4-modified/tests/functional/func_test.py
+--- syslog-ng-3.2.4/tests/functional/func_test.py	2010-07-09 11:19:27.000000000 +0100
++++ syslog-ng-3.2.4-modified/tests/functional/func_test.py	2011-05-16 20:47:48.586752031 +0100
+@@ -60,11 +60,12 @@
+ # import test modules
+ import test_file_source
+ import test_filters
+-import test_input_drivers
++#import test_input_drivers
+ import test_performance
+ import test_sql
+ 
+-tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
++#tests = (test_input_drivers, test_sql, test_file_source, test_filters, test_performance)
++tests = (test_sql, test_file_source, test_filters, test_performance)
+ 
+ init_env()
+ seed_rnd()
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 98488b4..25905de 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -5,7 +5,7 @@
 
 Name: syslog-ng
 Version: 3.2.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -17,7 +17,7 @@ Source2: syslog-ng.service
 Source3: syslog-ng.sysconfig
 Source4: syslog-ng.logrotate
 
-Patch0: syslog-ng-3.2.4-disable-sql-and-ssl-tests.patch
+Patch0: syslog-ng-3.2.4-disable-ssl-tests.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -26,12 +26,15 @@ BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: glib2-devel >= 2.10.1
-#BuildRequires: libdbi-devel
+BuildRequires: libdbi-devel
 BuildRequires: libnet-devel
 #BuildRequires: openssl-devel
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: tcp_wrappers-devel
 
+# For the SQL tests
+BuildRequires: libdbi-dbd-sqlite
+
 Requires: logrotate
 Requires(post): systemd-units
 Requires(preun): systemd-units
@@ -52,6 +55,16 @@ expressions. The new configuration scheme is intuitive and powerful.
 Forwarding logs over TCP and remembering all forwarding hops makes it
 ideal for firewalled environments.
 
+
+%package libdbi
+Summary: libdbi support for %{name}
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description libdbi
+This module supports a large number of database systems via libdbi.
+
+
 %package devel
 Summary: Development files for %{name}
 Group: Development/Libraries
@@ -90,7 +103,7 @@ developing applications that use %{name}.
     --enable-tcp-wrapper \
     --enable-pcre \
     --enable-spoof-source \
-    --disable-sql \
+    --enable-sql \
     --disable-ssl \
     --enable-shared \
     --disable-static \
@@ -225,6 +238,7 @@ fi
 %{_bindir}/update-patterndb
 %{_libdir}/lib%{name}.so.*
 %{_libdir}/%{name}/*.so
+%exclude %{_libdir}/%{name}/libafsql.so
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/syslog-ng.vim
@@ -239,6 +253,9 @@ fi
 %{_mandir}/man5/syslog-ng.conf.5*
 %{_mandir}/man8/syslog-ng.8*
 
+%files libdbi
+%{_libdir}/%{name}/libafsql.so
+
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/libsyslog-ng.so
@@ -248,6 +265,9 @@ fi
 
 
 %changelog
+* Tue May 17 2011 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.4-4
+- Enabled SQL support (subpackage syslog-ng-libdbi)
+
 * 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}