diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index bcaa1a2..03e7595 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -3,8 +3,8 @@
 
 pkgbase='ceph'
 pkgname=('ceph' 'ceph-libs' 'ceph-mgr')
-_zstdver=1.4.4
-pkgver=14.2.8
+_zstdver=1.4.5
+pkgver=14.2.12
 pkgrel=1
 pkgdesc='Distributed, fault-tolerant storage platform delivering object, block, and file system'
 arch=('x86_64')
@@ -47,16 +47,20 @@ source=("https://download.ceph.com/tarballs/${pkgbase}-${pkgver}.tar.gz"
         'use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch'
         'suppress-pylint-warnings.patch'
         'fix-mgr-dashboard-frontend-unittests-dist-stuff.patch'
-        "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz")
-sha512sums=('38b0c6df58579377528c8f8e06d0cbc40f471f6eb2fb4a05b395f6fddbd3f2117674545b2147d8730973b01967ddcd4322a769ba03f9c625417ed35cc39f195a'
+        "zstd-${_zstdver}.tar.gz::https://github.com/facebook/zstd/archive/v${_zstdver}.tar.gz"
+        https://github.com/ceph/ceph/commit/67bf182aa542a614c591b55c11736a0082feed47.patch
+        https://github.com/ceph/ceph/commit/b9b6faf66ae67648626470cb4fc3f0850ac4d842.patch)
+sha512sums=('5880f274732b5c6cd58d42ddda7627241b72a8d403e905032fc11d4cb01865d1553ac5e151ea443617d44279a57c6a9b4d71c4a386155ac2f9ae5ebebbae814d'
             '4354001c1abd9a0c385ba7bd529e3638fb6660b6a88d4e49706d4ac21c81b8e829303a20fb5445730bdac18c4865efb10bc809c1cd56d743c12aa9a52e160049'
             '02c9e8fd3c23fb4c9c4c576ee6d06e8525ca31decfd964fb7231e73c98fe2987a483dda680969752186f0918f47d9af4fb09a4901e5319077f45d870906716da'
             '2234d005df71b3b6013e6b76ad07a5791e3af7efec5f41c78eb1a9c92a22a67f0be9560be59b52534e90bfe251bcf32c33d5d40163f3f8f7e7420691f0f4a222'
             'a74aea7c0b0d1883c874f889c184bd2c766fa578d6ca0cbe5eaada840281bb947b3d80f142b30473058cd2652d2967d241ade6914d6be50e93e91728a31733c8'
-            '4345fc2f422c7c1910bfd4068ad39511fa63d8c1e4fc04af416bb0f3869e43327d4a4bfc980d5abf273693a532ac153ed1e4c03e033a127692c1254b99092b8a'
+            '49d28dd4213507f70537cc70d4c83147ee6764f388b459277d75c5712521cf8c52ea38b251986107c0a8db62d769a6fb67d925352f16afe5ecf28c21b630dcf2'
             '4afd5c3b49a839531921e80b1204ef5b496531a31b3de13042bfcbb548d736851ef7698e41bc94a9bed356e7c2cab6bf30bc711796249cf10ee791974033c29b'
-            '6265e083e0e8cba481741c7492a47e8144381287c2cbaef220a64bd889d8bac43cb5cc3efb01600cf785d585c950982a908deed10bedf0688c5cd2015e004c1f'
-            '8209837e8eb14e474dfe21d5511085f46cef93b03ab77613fd41e7b8be652418231c38852669c8e0b55b78ad41ea2cb8008d0da122a83f8f27e32b5c86f045cf')
+            '95778ae3f06db4e5038d040180974c6d1c43ab6a53085116a29fa79349a11e8d24f467589fcc2bc580f227372f3de57b66b94a7a9c2b9f333d5bce2431b28a1e'
+            'b03c497c3e0590c3d384cb856e3024f144b2bfac0d805d80e68deafa612c68237f12a2d657416d476a28059e80936c79f099fc42331464b417593895ea214387'
+            '8b61bd26b1a0442641d3237f1b4c09e7f43d6c52788a7b7088a5697b4e18bccb8f9ceaa0bd2fdfcbea12e8e182cdf038d2cfe671692758267ab72dff1c705f8e'
+            'f4f725db5ce8ff01088557891382f28b014a18accbca40b9939899e611377dc71bc94aa47333bbff544b65a7f7cb680bac4a1359481afe24354a0b5c4a9469e4')
 
 
 # -fno-plt causes linker errors (undefined reference to internal methods)
@@ -154,6 +158,7 @@ build() {
     -DWITH_RADOSGW_BEAST_FRONTEND=ON \
     -DWITH_RADOSGW_BEAST_OPENSSL=ON \
     -DWITH_RADOSGW_AMQP_ENDPOINT=OFF \
+    -DWITH_RADOSGW_KAFKA_ENDPOINT=OFF \
     -DWITH_SYSTEMD=ON \
     -DWITH_SYSTEM_BOOST=OFF \
     -DWITH_BOOST_CONTEXT=ON \
diff --git a/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch b/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
index 07c088b..5fd1bbe 100644
--- a/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
+++ b/trunk/fix-mgr-dashboard-frontend-unittests-dist-stuff.patch
@@ -9,7 +9,7 @@
  
  # Unit Tests
  config='src/unit-test-configuration.ts'
-@@ -25,22 +25,22 @@ if [ -e ${config}_old ]; then
+@@ -25,27 +25,27 @@ if [ -e ${config}_old ]; then
  fi
  
  # Linting
@@ -19,32 +19,40 @@
 -  echo -e "\nTry running 'npm run fix' to fix some linting errors. \
 -Some errors might need a manual fix."
 -fi
--
--# I18N
++#npm run lint --silent
++#if [ $? -gt 0 ]; then
++#  failed=true
++#  echo -e "\nTry running 'npm run fix' to fix some linting errors. \
++#Some errors might need a manual fix."
++#fi
+ 
+ # I18N
 -npm run i18n:extract
--i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
--if [[ ! -z $i18n_lint ]]; then
--  echo -e "The following source translations in 'messages.xlf' need to be \
--fixed, please check the I18N suggestions in 'HACKING.rst':\n"
--  echo "${i18n_lint}"
+-if [ $? -gt 0 ]; then
 -  failed=true
+-  echo -e "\nTranslations extraction has failed."
+-else
+-  i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
+-  if [ "$i18n_lint" ]; then
+-    echo -e "The following source translations in 'messages.xlf' need to be \
+-  fixed, please check the I18N suggestions in 'HACKING.rst':\n"
+-    echo "${i18n_lint}"
+-    failed=true
+-  fi
 -fi
-+# npm run lint --silent
-+# if [ $? -gt 0 ]; then
-+#   failed=true
-+#   echo -e "\nTry running 'npm run fix' to fix some linting errors. \
-+# Some errors might need a manual fix."
-+# fi
-+# 
-+# # I18N
-+# npm run i18n:extract
-+# i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
-+# if [[ ! -z $i18n_lint ]]; then
-+#   echo -e "The following source translations in 'messages.xlf' need to be \
-+# fixed, please check the I18N suggestions in 'HACKING.rst':\n"
-+#   echo "${i18n_lint}"
-+#   failed=true
-+# fi
++#npm run i18n:extract
++#if [ $? -gt 0 ]; then
++#  failed=true
++#  echo -e "\nTranslations extraction has failed."
++#else
++#  i18n_lint=`awk '/<source> |<source>$| <\/source>/,/<\/context-group>/ {printf "%-4s ", NR; print}' src/locale/messages.xlf`
++#  if [ "$i18n_lint" ]; then
++#    echo -e "The following source translations in 'messages.xlf' need to be \
++#  fixed, please check the I18N suggestions in 'HACKING.rst':\n"
++#    echo "${i18n_lint}"
++#    failed=true
++#  fi
++#fi
  
  if [ `uname` != "FreeBSD" ]; then
    deactivate
diff --git a/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch b/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
index ec5ea53..994fcaa 100644
--- a/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
+++ b/trunk/use-system-zstd-and-fix-zstd-1.4.0-compatbility.patch
@@ -9,27 +9,27 @@
  
  #include "include/buffer.h"
  #include "include/encoding.h"
-@@ -30,7 +30,13 @@ class ZstdCompressor : public Compressor
+@@ -28,7 +28,13 @@ class ZstdCompressor : public Compressor {
  
    int compress(const bufferlist &src, bufferlist &dst) override {
      ZSTD_CStream *s = ZSTD_createCStream();
--    ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
+-    ZSTD_initCStream_srcSize(s, cct->_conf->compressor_zstd_level, src.length());
 +
-+    // ZSTD_initCStream_srcSize(s, COMPRESSION_LEVEL, src.length());
++    // ZSTD_initCStream_srcSize(s, cct->_conf->compressor_zstd_level, src.length());
 +    ZSTD_CCtx_reset(s, ZSTD_reset_session_only);
 +    ZSTD_CCtx_refCDict(s, NULL); // clear the dictionary (if any)
-+    ZSTD_CCtx_setParameter(s, ZSTD_c_compressionLevel, COMPRESSION_LEVEL);
++    ZSTD_CCtx_setParameter(s, ZSTD_c_compressionLevel, cct->_conf->compressor_zstd_level);
 +    ZSTD_CCtx_setPledgedSrcSize(s, src.length());
 +
      auto p = src.begin();
      size_t left = src.length();
  
-@@ -48,7 +54,7 @@ class ZstdCompressor : public Compressor
+@@ -46,7 +52,7 @@ class ZstdCompressor : public Compressor {
        inbuf.size = p.get_ptr_and_advance(left, (const char**)&inbuf.src);
        left -= inbuf.size;
        ZSTD_EndDirective const zed = (left==0) ? ZSTD_e_end : ZSTD_e_continue;
 -      size_t r = ZSTD_compress_generic(s, &outbuf, &inbuf, zed);
 +      size_t r = ZSTD_compressStream2(s, &outbuf, &inbuf, zed);
        if (ZSTD_isError(r)) {
- 	return -EINVAL;
+        return -EINVAL;
        }