diff --git a/.travis.yml b/.travis.yml
index 06b7c1a86754ce5af2e6d944b7ece2c295372ad0..c21eb94300d32ba61516d6990621485ebba0bf02 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,8 +11,8 @@ matrix:
 before_script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
       brew update;
-      brew install cppunit protobuf log4cxx popt;
-      travis_wait 30 brew install --devel libswiften;
+      brew install cppunit protobuf log4cxx popt jsoncpp;
+      travis_wait 30 brew install libswiften;
     fi
 script:
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
diff --git a/Dockerfile b/Dockerfile
index dc3057382cc569c6a7c6c5788d088bde5735fa9a..229ed8be1b843179456a5b47869d3b1003de4fcf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,7 +6,7 @@ ARG commit=unknown
 RUN echo $commit
 
 # Spectrum 2
-RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel gettext libgcrypt-devel libwebp-devel libpurple-devel zlib-devel json-glib-devel python-pip zlib-devel libjpeg-devel python-devel mysql-devel popt-devel git libev-libevent-devel qt-devel dbus-glib-devel libcurl-devel wget mercurial libtool libgnome-keyring-devel nss-devel -y && \
+RUN dnf install protobuf protobuf swiften gcc gcc-c++ make libpqxx-devel libpurple-devel protobuf-devel swiften-devel rpm-build avahi-devel boost-devel cmake cppunit-devel expat-devel libcommuni-devel libidn-devel libsqlite3x-devel log4cxx-devel gettext libgcrypt-devel libwebp-devel libpurple-devel zlib-devel json-glib-devel python-pip zlib-devel libjpeg-devel python-devel mysql-devel popt-devel git libev-libevent-devel qt-devel dbus-glib-devel libcurl-devel wget mercurial libtool libgnome-keyring-devel nss-devel jsoncpp-devel -y && \
 	echo "---> Installing Spectrum 2" && \
 		git clone git://github.com/hanzz/spectrum2.git && \
 		cd spectrum2 && \
diff --git a/Dockerfile.stretch b/Dockerfile.stretch
index e49a5ca80840179ed8f50257d41730e94e69f8a2..36acdfaa4b1e6b617a2e589f0d039353ec46fcd4 100644
--- a/Dockerfile.stretch
+++ b/Dockerfile.stretch
@@ -6,11 +6,11 @@ RUN echo force-confold | tee -a /etc/dpkg/dpkg.cfg
 RUN apt-get update -qq
 RUN apt-get install -y --force-yes apt-transport-https curl gnupg1
 RUN echo "deb https://packages.spectrum.im/spectrum2/ stretch main" | tee -a /etc/apt/sources.list
-RUN echo "deb https://swift.im/packages/debian/stretch beta main" | tee -a /etc/apt/sources.list
+RUN echo "deb https://swift.im/packages/debian/stretch release main" | tee -a /etc/apt/sources.list
 RUN curl https://swift.im/keys/packages.key | apt-key add -
 RUN apt-key adv --keyserver hkp://pool.sks-keyservers.net --recv-keys 1AFDEA51
 RUN apt-get update -qq
-RUN apt-get install -y --force-yes build-essential git cmake prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler libpurple-dev libglib2.0-dev libdbus-glib-1-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev libminiupnpc-dev libnatpmp-dev libssl-dev libcurl4-openssl-dev libidn11-dev libxml2-dev libsqlite3-dev libqt4-dev
+RUN apt-get install -y --force-yes build-essential git cmake prosody ngircd python-sleekxmpp libswiften-dev libprotobuf-dev protobuf-compiler libpurple-dev libglib2.0-dev libdbus-glib-1-dev liblog4cxx10-dev libpopt-dev libboost-dev libboost-signals-dev libboost-system-dev libboost-thread-dev libboost-locale-dev libboost-filesystem-dev libboost-program-options-dev libboost-regex-dev libboost-date-time-dev libcppunit-dev libcommuni-dev libminiupnpc-dev libnatpmp-dev libssl-dev libcurl4-openssl-dev libidn11-dev libxml2-dev libsqlite3-dev libqt4-dev libjsoncpp-dev
 RUN git clone git://github.com/SpectrumIM/spectrum2.git && cd spectrum2
 RUN cd spectrum2 && cmake -DCMAKE_BUILD_TYPE=Debug -DENABLE_TESTS=ON . && make
 RUN cd spectrum2 && make extended_test
diff --git a/packaging/debian/debian/control b/packaging/debian/debian/control
index d573cfee160fc16590199fb8a6555ce90e5722c2..162018c30f7fc100e49f2614146632add2bc3980 100644
--- a/packaging/debian/debian/control
+++ b/packaging/debian/debian/control
@@ -6,7 +6,7 @@ Build-Depends: debhelper (>= 7.0.50~), libpurple-dev, libswiften-dev,
  libprotobuf-dev, libmysqlclient-dev | default-libmysqlclient-dev, liblog4cxx10-dev, protobuf-compiler,
  libpopt-dev, libdbus-glib-1-dev, libpqxx-dev | libpqxx3-dev, cmake, libev-libevent-dev | libevent-dev, libboost-all-dev,
  libqt4-dev, libidn11-dev, libxml2-dev, libavahi-client-dev, libavahi-common-dev,
- libcurl4-openssl-dev, libcommuni-dev, libsqlite3-dev
+ libcurl4-openssl-dev, libcommuni-dev, libsqlite3-dev, libjsoncpp-dev
 Standards-Version: 3.9.6
 VCS-Browser: http://git.fsinf.at/apt/spectrum2
 VCS-Git: https://git.fsinf.at/apt/spectrum2.git
diff --git a/packaging/fedora/spectrum2.spec b/packaging/fedora/spectrum2.spec
index 54523c8c307b9b73a8505f530eae5372a8c978c2..c56fbb006de087d0b43739a61f4564fca06080f6 100644
--- a/packaging/fedora/spectrum2.spec
+++ b/packaging/fedora/spectrum2.spec
@@ -31,6 +31,7 @@ BuildRequires: libcurl-devel
 BuildRequires: libev-libevent-devel
 BuildRequires: libpqxx-devel
 BuildRequires: libpurple-devel
+BuildRequires: jsoncpp-devel
 Requires:      libtransport%{?_isa} = %{version}-%{release}
 
 %description