diff --git a/.SRCINFO b/.SRCINFO
index 7b6756e..4d2f0d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = clickhouse
 	pkgdesc = An open-source column-oriented database management system that allows generating analytical data reports in real time
-	pkgver = 1.1.54198
+	pkgver = 1.1.54231
 	pkgrel = 1
 	url = https://clickhouse.yandex/
 	install = clickhouse.install
@@ -17,10 +17,14 @@ pkgbase = clickhouse
 	backup = etc/clickhouse-client/config.xml
 	backup = etc/clickhouse-server/config.xml
 	backup = etc/clickhouse-server/users.xml
-	source = https://github.com/yandex/ClickHouse/archive/v1.1.54198-stable.tar.gz
+	source = https://github.com/yandex/ClickHouse/archive/v1.1.54231-stable.tar.gz
 	source = clickhouse-server.service
-	md5sums = 8c3f171c716558b8576977618dca3043
+	source = clickhouse-mongodb.patch
+	source = https://gist.github.com/kmeaw/bf6703543421abb68e0c524c1f48026f/raw/a2afde429cd795103fc2511ba31ada98c31d7b5d/clickhouse-lz4.patch
+	md5sums = 32f49d54c8482ff1e17e13f33514eaa3
 	md5sums = f9f5663b0a9a58e99f481efe9d193e85
+	md5sums = 127966b32939673fa0b695f0360555b0
+	md5sums = ba6a4ec1c6b9040f1ff27bb18d998fb7
 
 pkgname = clickhouse
 
diff --git a/PKGBUILD b/PKGBUILD
index dbe46bc..b19aa4c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dmitry Bilunov <kmeaw@yandex-team.ru>
 
 pkgname=clickhouse
-pkgver=1.1.54198
+pkgver=1.1.54231
 pkgrel=1
 pkgdesc='An open-source column-oriented database management system that allows generating analytical data reports in real time'
 arch=('i686' 'x86_64')
@@ -10,16 +10,23 @@ url='https://clickhouse.yandex/'
 license=('Apache')
 depends=('ncurses' 'readline' 'unixodbc' 'termcap')
 makedepends=('poco' 'cmake' 'gcc>=6.2')
-source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz clickhouse-server.service)
-md5sums=('8c3f171c716558b8576977618dca3043'
-         'f9f5663b0a9a58e99f481efe9d193e85')
+source=(https://github.com/yandex/ClickHouse/archive/v$pkgver-stable.tar.gz
+        clickhouse-server.service
+        clickhouse-mongodb.patch
+        https://gist.github.com/kmeaw/bf6703543421abb68e0c524c1f48026f/raw/a2afde429cd795103fc2511ba31ada98c31d7b5d/clickhouse-lz4.patch)
+md5sums=('32f49d54c8482ff1e17e13f33514eaa3'
+         'f9f5663b0a9a58e99f481efe9d193e85'
+         '127966b32939673fa0b695f0360555b0'
+         'ba6a4ec1c6b9040f1ff27bb18d998fb7')
 backup=('etc/clickhouse-client/config.xml' 'etc/clickhouse-server/config.xml' 'etc/clickhouse-server/users.xml')
 install=$pkgname.install
 
 build() {
   cd ClickHouse-$pkgver-stable
   sed -e 's/mysqlxx common\(.*\) \(\${Z_LIB}\)/mysqlxx \2 common\1/' -i libs/libmysqlxx/CMakeLists.txt
-  cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D ENABLE_TESTS:BOOL=False .
+  patch -p1 < ../clickhouse-mongodb.patch
+  patch -p1 < ../clickhouse-lz4.patch
+  cmake -D CMAKE_BUILD_TYPE:STRING=Release -D USE_STATIC_LIBRARIES:BOOL=False -D ENABLE_TESTS:BOOL=False -D UNBUNDLED:BOOL=True .
   make clickhouse
 }
 
diff --git a/clickhouse-mongodb.patch b/clickhouse-mongodb.patch
new file mode 100644
index 0000000..84dd15e
--- /dev/null
+++ b/clickhouse-mongodb.patch
@@ -0,0 +1,18 @@
+--- a/dbms/src/Dictionaries/MongoDBDictionarySource.cpp	2017-05-16 13:59:48.153072479 +0300
++++ b/dbms/src/Dictionaries/MongoDBDictionarySource.cpp	2017-05-16 14:00:07.566365200 +0300
+@@ -32,6 +32,7 @@
+ static const size_t max_block_size = 8192;
+ 
+ 
++#if POCO_VERSION < 0x01070800
+ /// See https://pocoproject.org/forum/viewtopic.php?f=10&t=6326&p=11426&hilit=mongodb+auth#p11485
+ static void authenticate(Poco::MongoDB::Connection & connection,
+     const std::string & database, const std::string & user, const std::string & password)
+@@ -117,6 +118,7 @@
+         }
+     }
+ }
++#endif
+ 
+ 
+ MongoDBDictionarySource::MongoDBDictionarySource(