diff --git a/.gitignore b/.gitignore
index 45c63f0..e72ccee 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-doc-8.12.0.tar.gz
 /rsyslog-8.21.0.tar.gz
 /rsyslog-doc-8.21.0.tar.gz
+/rsyslog-doc-8.22.0.tar.gz
+/rsyslog-8.22.0.tar.gz
diff --git a/rsyslog.spec b/rsyslog.spec
index 638db9c..f084a05 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -11,7 +11,7 @@
 
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
-Version: 8.21.0
+Version: 8.22.0
 Release: 1%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
@@ -27,7 +27,7 @@ BuildRequires: automake
 BuildRequires: bison
 BuildRequires: dos2unix
 BuildRequires: flex
-BuildRequires: json-c-devel
+BuildRequires: libfastjson
 BuildRequires: libestr-devel >= 0.1.9
 BuildRequires: liblogging-stdlog-devel
 BuildRequires: libtool
@@ -37,6 +37,7 @@ BuildRequires: python-docutils
 # make sure systemd is in a version that isn't affected by rhbz#974132
 BuildRequires: systemd-devel >= 204-8
 BuildRequires: zlib-devel
+BuildRequires: qpid-proton-c-devel 
 
 Requires: logrotate >= 3.5.2
 Requires: bash >= 2.0
@@ -157,6 +158,12 @@ Group: System Environment/Daemons
 Requires: %name = %version-%release
 BuildRequires: libnet-devel
 
+%package omamqp1
+Summary: Provides the omamqp1 module
+Group: System Environment/Daemons
+Requires: %name = %version-%release
+BuildRequires: qpid-proton-c-devel
+
 %description
 Rsyslog is an enhanced, multi-threaded syslog daemon. It supports MySQL,
 syslog/TCP, RFC 3195, permitted sender lists, filtering on any message part,
@@ -242,6 +249,10 @@ This module is similar to the regular UDP forwarder, but permits to
 spoof the sender address. Also, it enables to circle through a number
 of source ports.
 
+%description omamqp1
+The omamqp1 output module can be used to send log messages via an AMQP 
+1.0-compatible messaging bus.
+
 %prep
 # set up rsyslog-doc sources
 %setup -q -a 1 -T -c
@@ -289,6 +300,7 @@ export HIREDIS_LIBS="-L%{_libdir} -lhiredis"
 	--enable-mmnormalize \
 	--enable-mmsnmptrapd \
 	--enable-mysql \
+	--enable-omamqp1 \
 %if %{want_hiredis}
 	--enable-omhiredis \
 %endif
@@ -499,7 +511,16 @@ done
 %defattr(-,root,root)
 %{_libdir}/rsyslog/omudpspoof.so
 
+%files omamqp1
+%defattr(-,root,root)
+%{_libdir}/rsyslog/omamqp1.so
+
 %changelog
+* Thu Nov 10 2016 Tomas Sykora <tosykora@redhat.com> 8.22.0-1
+- rebase to 8.22.0
+  - added omamqp1 subpackage
+  - changed BuildRequires from json-c to libfastjson
+
 * Wed Oct 05 2016 Radovan Sroka <rsroka@redhat.com> 8.21.0-1
 - rebase to 8.21.0
 - dropped rsyslog-8.12.0-gnutls-detection.patch 
diff --git a/sources b/sources
index b7586a6..085f7fa 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-f9b89a192090cd56f80c2ff930b5fd30  rsyslog-8.21.0.tar.gz
-cf08e576c71ce1379fdae7b74ccc623e  rsyslog-doc-8.21.0.tar.gz
+29e1a6f1edcf1cf6c4d5e0b0d21c7213  rsyslog-doc-8.22.0.tar.gz
+ad0f25f429aa2daa326732950a5eeb6c  rsyslog-8.22.0.tar.gz