diff --git a/syslog-ng.spec b/syslog-ng.spec
index 314bd58..c82f9de 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -3,7 +3,7 @@
 
 Name: syslog-ng
 Version: 3.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -21,27 +21,30 @@ BuildRequires: systemd-units
 BuildRequires: pkgconfig
 BuildRequires: libtool
 BuildRequires: bison, flex
+BuildRequires: libxslt
 BuildRequires: eventlog-devel >= %{evtlog_ver}
 BuildRequires: glib2-devel >= 2.10.1
 BuildRequires: ivykis-devel >= %{ivykis_ver}
+BuildRequires: json-c-devel
+#BuildRequires: json-glib-devel
 BuildRequires: libcap-devel
+BuildRequires: libdbi-devel
+BuildRequires: libnet-devel
 BuildRequires: openssl-devel
 BuildRequires: pcre-devel >= 6.1
 BuildRequires: tcp_wrappers-devel
 BuildRequires: libuuid-devel
+BuildRequires: libesmtp-devel
+BuildRequires: libmongo-client-devel
+BuildRequires: GeoIP-devel
 BuildRequires: systemd-devel
 BuildRequires: hiredis-devel
-
-BuildRequires: json-c-devel
-BuildRequires: libesmtp-devel
-BuildRequires: GeoIP-devel
-BuildRequires: libdbi-devel
-BuildRequires: libnet-devel
+#BuildRequires: librabbitmq-devel
 
 # Test suite
 BuildRequires: python
 # Test suite: the SQL tests
-#BuildRequires: libdbi-dbd-sqlite
+# BuildRequires: libdbi-dbd-sqlite
 
 Requires: logrotate
 Requires: ivykis >= %{ivykis_ver}
@@ -84,6 +87,15 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 This module supports a large number of database systems via libdbi.
 
 
+%package mongodb
+Summary: mongodb support for %{name}
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description mongodb
+This module supports the mongodb database via libmongo-client.
+
+
 %package smtp
 Summary: smtp support for %{name}
 Group: Development/Libraries
@@ -158,6 +170,7 @@ GEOIP_LIBS=-lGeoIP; export GEOIP_LIBS; \
     --with-module-dir=/%{_libdir}/%{name} \
     --with-systemdsystemunitdir=%{_unitdir} \
     --with-ivykis=system \
+    --with-libmongo-client=system \
     --with-embedded-crypto \
     --enable-man-pages \
     --enable-ipv6 \
@@ -219,7 +232,6 @@ rm %{buildroot}/%{_libdir}/pkgconfig/syslog-ng-test.pc
 rm %{buildroot}/%{_libdir}/syslog-ng/libtest/libsyslog-ng-test.a
 
 
-
 %check
 LD_LIBRARY_PATH=%{buildroot}/%{_libdir}:%{buildroot}/%{_libdir}/%{name} make check
 
@@ -310,6 +322,9 @@ fi
 %files libdbi
 %{_libdir}/%{name}/libafsql.so
 
+%files mongodb
+%{_libdir}/%{name}/libafmongodb.so
+
 %files redis
 %{_libdir}/%{name}/libredis.so
 
@@ -331,6 +346,11 @@ fi
 
 
 %changelog
+* Thu Jul 31 2014 Peter Czanik <czanik@balabit.hu> - 3.5.5-2
+- enabled mongodb destination support
+- merged with master for easier editing
+- disabled installing libdbi-dbd-sqlite as it's not available
+
 * Mon Jul 21 2014 Peter Czanik <czanik@balabit.hu> - 3.5.5-1
 - update to 3.5.5 (bugfix release)
 - enable SQL, smtp, json and geoip support