diff --git a/3party/bsdiff-courgette/bsdiff/bsdiff.h b/3party/bsdiff-courgette/bsdiff/bsdiff.h
index cce2a4420a..eecdf2f059 100644
--- a/3party/bsdiff-courgette/bsdiff/bsdiff.h
+++ b/3party/bsdiff-courgette/bsdiff/bsdiff.h
@@ -70,6 +70,7 @@
 #define COURGETTE_THIRD_PARTY_BSDIFF_BSDIFF_H_
 
 #include "coding/varint.hpp"
+#include "coding/write_to_sink.hpp"
 #include "coding/writer.hpp"
 
 #include "base/checked_cast.hpp"
diff --git a/generator/mwm_diff/diff.cpp b/generator/mwm_diff/diff.cpp
index 5c7c3d12af..68276122a1 100644
--- a/generator/mwm_diff/diff.cpp
+++ b/generator/mwm_diff/diff.cpp
@@ -2,53 +2,121 @@
 
 #include "coding/file_reader.hpp"
 #include "coding/file_writer.hpp"
-#include "coding/read_write_utils.hpp"
 #include "coding/reader.hpp"
+#include "coding/write_to_sink.hpp"
+#include "coding/writer.hpp"
+#include "coding/zlib.hpp"
 
 #include "base/logging.hpp"
 
+#include <cstdint>
+#include <iterator>
+#include <vector>
+
+#include "3party/bsdiff-courgette/bsdiff/bsdiff.h"
+
 using namespace std;
 
 namespace
 {
-// We could use my::CopyFileX but it fails if the file at |srcFile| is empty.
-bool CopyFile(string const & srcFile, string const & dstFile)
-{
-  try
-  {
-    FileReader reader(srcFile, true /* withExceptions */);
-    ReaderSource<FileReader> src(reader);
-    FileWriter writer(dstFile);
-
-    rw::ReadAndWrite(src, writer);
-  }
-  catch (Reader::Exception const & e)
-  {
-    LOG(LERROR, ("Could not read from", srcFile, ":", e.Msg()));
-    return false;
-  }
-  catch (Writer::Exception const & e)
-  {
-    LOG(LERROR, ("Could not write to", dstFile, ":", e.Msg()));
-    return false;
-  }
-
-  return true;
-}
+// Format Version 0: bsdiff+gzip.
+uint32_t const kLatestVersion = 0;
 }  // namespace
 
 namespace generator
 {
 namespace mwm_diff
 {
-bool MakeDiff(string const & /* oldMwmPath */, string const & newMwmPath, string const & diffPath)
+bool MakeDiff(string const & oldMwmPath, string const & newMwmPath, string const & diffPath)
 {
-  return CopyFile(newMwmPath, diffPath);
+  try
+  {
+    FileReader oldReader(oldMwmPath);
+    FileReader newReader(newMwmPath);
+    FileWriter diffFileWriter(diffPath);
+
+    vector<uint8_t> diffBuf;
+    MemWriter<vector<uint8_t>> diffMemWriter(diffBuf);
+
+    auto const status = bsdiff::CreateBinaryPatch(oldReader, newReader, diffMemWriter);
+
+    if (status != bsdiff::BSDiffStatus::OK)
+    {
+      LOG(LERROR, ("Could not create patch with bsdiff:", status));
+      return false;
+    }
+
+    using Deflate = coding::ZLib::Deflate;
+    Deflate deflate(Deflate::Format::ZLib, Deflate::Level::BestCompression);
+
+    vector<uint8_t> deflatedDiffBuf;
+    deflate(diffBuf.data(), diffBuf.size(), back_inserter(deflatedDiffBuf));
+
+    uint32_t const header = kLatestVersion;
+    WriteToSink(diffFileWriter, header);
+    diffFileWriter.Write(deflatedDiffBuf.data(), deflatedDiffBuf.size());
+  }
+  catch (Reader::Exception const & e)
+  {
+    LOG(LERROR, ("Could not open file when creating a patch:", e.Msg()));
+    return false;
+  }
+  catch (Writer::Exception const & e)
+  {
+    LOG(LERROR, ("Could not open file when creating a patch:", e.Msg()));
+    return false;
+  }
+
+  return true;
 }
 
-bool ApplyDiff(string const & /* oldMwmPath */, string const & newMwmPath, string const & diffPath)
+bool ApplyDiff(string const & oldMwmPath, string const & newMwmPath, string const & diffPath)
 {
-  return CopyFile(diffPath, newMwmPath);
+  try
+  {
+    FileReader oldReader(oldMwmPath);
+    FileWriter newWriter(newMwmPath);
+    FileReader diffFileReader(diffPath);
+
+    ReaderSource<FileReader> diffFileSource(diffFileReader);
+    auto const header = ReadPrimitiveFromSource<uint32_t>(diffFileSource);
+    if (header != kLatestVersion)
+    {
+      LOG(LERROR, ("Unknown version format of mwm diff:", header));
+      return false;
+    }
+
+    vector<uint8_t> deflatedDiff(diffFileSource.Size());
+    diffFileSource.Read(deflatedDiff.data(), deflatedDiff.size());
+
+    using Inflate = coding::ZLib::Inflate;
+    vector<uint8_t> decompressedData;
+    Inflate inflate(Inflate::Format::ZLib);
+    vector<uint8_t> diffBuf;
+    inflate(deflatedDiff.data(), deflatedDiff.size(), back_inserter(diffBuf));
+
+    MemReader diffMemReader(diffBuf.data(), diffBuf.size());
+
+    auto status = bsdiff::ApplyBinaryPatch(oldReader, newWriter, diffMemReader);
+
+    if (status != bsdiff::BSDiffStatus::OK)
+    {
+      LOG(LERROR, ("Could not apply patch with bsdiff:", status));
+      return false;
+    }
+  }
+  catch (Reader::Exception const & e)
+  {
+    LOG(LERROR, ("Could not open file when applying a patch:", e.Msg()));
+    return false;
+  }
+  catch (Writer::Exception const & e)
+  {
+    LOG(LERROR, ("Could not open file when applying a patch:", e.Msg()));
+    return false;
+  }
+
+  return true;
 }
 }  // namespace mwm_diff
 }  // namespace generator
diff --git a/generator/mwm_diff/mwm_diff_tests/CMakeLists.txt b/generator/mwm_diff/mwm_diff_tests/CMakeLists.txt
index 64a85350e0..92dd2a0cee 100644
--- a/generator/mwm_diff/mwm_diff_tests/CMakeLists.txt
+++ b/generator/mwm_diff/mwm_diff_tests/CMakeLists.txt
@@ -10,6 +10,7 @@ omim_add_test(${PROJECT_NAME} ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   mwm_diff
+  bsdiff
   platform
   coding
   base
diff --git a/generator/mwm_diff/pymwm_diff/CMakeLists.txt b/generator/mwm_diff/pymwm_diff/CMakeLists.txt
index ffaa43f5da..4afd1953cf 100644
--- a/generator/mwm_diff/pymwm_diff/CMakeLists.txt
+++ b/generator/mwm_diff/pymwm_diff/CMakeLists.txt
@@ -10,6 +10,7 @@ add_library(${PROJECT_NAME} MODULE ${SRC})
 omim_link_libraries(
   ${PROJECT_NAME}
   mwm_diff
+  bsdiff
   platform
   coding
   base