diff --git a/search/processor.cpp b/search/processor.cpp
index 98ec213d81..079e70cecc 100644
--- a/search/processor.cpp
+++ b/search/processor.cpp
@@ -7,6 +7,7 @@
 #include "search/intermediate_result.hpp"
 #include "search/latlon_match.hpp"
 #include "search/mode.hpp"
+#include "search/postcode_points.hpp"
 #include "search/pre_ranking_info.hpp"
 #include "search/query_params.hpp"
 #include "search/ranking_info.hpp"
@@ -27,6 +28,7 @@
 #include "indexer/feature_impl.hpp"
 #include "indexer/features_vector.hpp"
 #include "indexer/ftypes_matcher.hpp"
+#include "indexer/postcodes_matcher.hpp"
 #include "indexer/scales.hpp"
 #include "indexer/search_delimiters.hpp"
 #include "indexer/search_string_utils.hpp"
@@ -152,15 +154,16 @@ Processor::Processor(DataSource const & dataSource, CategoriesHolder const & cat
                      storage::CountryInfoGetter const & infoGetter)
   : m_categories(categories)
   , m_infoGetter(infoGetter)
+  , m_dataSource(dataSource)
   , m_villagesCache(static_cast<base::Cancellable const &>(*this))
   , m_localitiesCache(static_cast<base::Cancellable const &>(*this))
-  , m_citiesBoundaries(dataSource)
+  , m_citiesBoundaries(m_dataSource)
   , m_keywordsScorer(LanguageTier::LANGUAGE_TIER_COUNT)
-  , m_ranker(dataSource, m_citiesBoundaries, infoGetter, m_keywordsScorer, m_emitter, categories,
+  , m_ranker(m_dataSource, m_citiesBoundaries, infoGetter, m_keywordsScorer, m_emitter, categories,
              suggests, m_villagesCache, static_cast<base::Cancellable const &>(*this))
-  , m_preRanker(dataSource, m_ranker)
-  , m_geocoder(dataSource, infoGetter, categories, m_citiesBoundaries, m_preRanker, m_villagesCache,
-               m_localitiesCache, static_cast<base::Cancellable const &>(*this))
+  , m_preRanker(m_dataSource, m_ranker)
+  , m_geocoder(m_dataSource, infoGetter, categories, m_citiesBoundaries, m_preRanker,
+               m_villagesCache, m_localitiesCache, static_cast<base::Cancellable const &>(*this))
   , m_bookmarksProcessor(m_emitter, static_cast<base::Cancellable const &>(*this))
 {
   // Current and input langs are to be set later.
@@ -466,6 +469,7 @@ void Processor::Search(SearchParams const & params)
     {
       SearchCoordinates();
       SearchPlusCode();
+      SearchPostcode();
       if (viewportSearch)
       {
         m_geocoder.GoInViewport();
@@ -534,6 +538,48 @@ void Processor::SearchPlusCode()
   m_emitter.Emit();
 }
 
+void Processor::SearchPostcode()
+{
+  // Create a copy of the query to trim it in-place.
+  string query(m_query);
+  strings::Trim(query);
+
+  if (!LooksLikePostcode(query, !m_prefix.empty()))
+    return;
+
+  vector<shared_ptr<MwmInfo>> infos;
+  m_dataSource.GetMwmsInfo(infos);
+
+  for (auto const & info : infos)
+  {
+    auto handle = m_dataSource.GetMwmHandleById(MwmSet::MwmId(info));
+    if (!handle.IsAlive())
+      continue;
+    auto & value = *handle.GetValue<MwmValue>();
+    if (!value.m_cont.IsExist(POSTCODE_POINTS_FILE_TAG))
+      continue;
+
+    PostcodePoints postcodes(value);
+
+    vector<m2::PointD> points;
+    postcodes.Get(NormalizeAndSimplifyString(query), points);
+    if (points.empty())
+      continue;
+
+    m2::RectD r;
+    for (auto const & p : points)
+      r.Add(p);
+
+    auto const center = r.Center();
+    auto const lat = MercatorBounds::YToLat(center.y);
+    auto const lon = MercatorBounds::XToLon(center.x);
+    m_emitter.AddResultNoChecks(m_ranker.MakeResult(RankerResult(lat, lon), true /* needAddress */,
+                                                    false /* needHighlighting */));
+    m_emitter.Emit();
+    return;
+  }
+}
+
 void Processor::SearchBookmarks(bookmarks::GroupId const & groupId)
 {
   bookmarks::Processor::Params params;
diff --git a/search/processor.hpp b/search/processor.hpp
index 07965c8cfc..7b01e554a2 100644
--- a/search/processor.hpp
+++ b/search/processor.hpp
@@ -77,6 +77,9 @@ public:
   void SearchCoordinates();
   // Tries to parse a plus code from |m_query| and generate a (lat, lon) result.
   void SearchPlusCode();
+  // Tries to parse a postcode from |m_query| and generate a (lat, lon) result based on
+  // POSTCODE_POINTS section.
+  void SearchPostcode();
 
   void SearchBookmarks(bookmarks::GroupId const & groupId);
 
@@ -139,6 +142,8 @@ protected:
   int8_t m_inputLocaleCode = StringUtf8Multilang::kUnsupportedLanguageCode;
   int8_t m_currentLocaleCode = StringUtf8Multilang::kUnsupportedLanguageCode;
 
+  DataSource const & m_dataSource;
+
   VillagesCache m_villagesCache;
   LocalitiesCache m_localitiesCache;
   CitiesBoundariesTable m_citiesBoundaries;
diff --git a/search/search_integration_tests/postcode_points_tests.cpp b/search/search_integration_tests/postcode_points_tests.cpp
index 08acaa79a2..9d687a3fd1 100644
--- a/search/search_integration_tests/postcode_points_tests.cpp
+++ b/search/search_integration_tests/postcode_points_tests.cpp
@@ -93,4 +93,48 @@ UNIT_CLASS_TEST(PostcodePointsTest, Smoke)
     TEST(base::AlmostEqualAbs(points[2], m2::PointD(0.2, 0.2), kMwmPointAccuracy), ());
   }
 }
+
+UNIT_CLASS_TEST(PostcodePointsTest, SearchPostcode)
+{
+  string const countryName = "Wonderland";
+
+  Platform & platform = GetPlatform();
+  auto const & writableDir = platform.WritableDir();
+  string const testFile = "postcodes.csv";
+  auto const postcodesRelativePath = base::JoinPath(writableDir, testFile);
+
+  // <outward>,<inward>,<easting>,<northing>,<WGS84 lat>,<WGS84 long>,<2+6 NGR>,<grid>,<sources>
+  ScopedFile const osmScopedFile(testFile,
+                                 "BA6, 7JP, dummy, dummy, 0.4, 0.4, dummy, dummy, dummy\n"
+                                 "BA6, 8JP, dummy, dummy, 0.6, 0.6, dummy, dummy, dummy\n");
+
+  auto infoGetter = std::make_shared<storage::CountryInfoGetterForTesting>();
+  infoGetter->AddCountry(
+      storage::CountryDef(countryName, m2::RectD(m2::PointD(0.0, 0.0), m2::PointD(1.0, 1.0))));
+
+  auto const id = BuildCountry(countryName, [&](TestMwmBuilder & builder) {
+    builder.SetPostcodesData(postcodesRelativePath, infoGetter);
+  });
+
+  auto test = [&](string const & query, m2::PointD const & expected) {
+    auto request = MakeRequest(query);
+    auto const & results = request->Results();
+    TEST_EQUAL(results.size(), 1, ());
+
+    auto const & result = results[0];
+    TEST_EQUAL(result.GetResultType(), Result::Type::LatLon, ());
+    TEST(result.HasPoint(), ());
+
+    auto const actual = result.GetFeatureCenter();
+    TEST(base::AlmostEqualAbs(expected, actual, kMwmPointAccuracy), ());
+  };
+
+  test("BA6 7JP", MercatorBounds::FromLatLon(0.4, 0.4));
+  test("BA6 7JP ", MercatorBounds::FromLatLon(0.4, 0.4));
+  test("BA6 8JP", MercatorBounds::FromLatLon(0.6, 0.6));
+  test("BA6 8JP ", MercatorBounds::FromLatLon(0.6, 0.6));
+  // Search should return center of all inward codes for outward query.
+  test("BA6", MercatorBounds::FromLatLon(0.5, 0.5));
+  test("BA6 ", MercatorBounds::FromLatLon(0.5, 0.5));
+}
 }  // namespace