diff --git a/docs/COMMIT_MESSAGES.md b/docs/COMMIT_MESSAGES.md
new file mode 100644
index 0000000000..313018ef57
--- /dev/null
+++ b/docs/COMMIT_MESSAGES.md
@@ -0,0 +1,71 @@
+# How to write a commit message
+
+Any commit needs a helpful message. Mind the following guidelines when committing to any of OMaps repositories at GitHub.
+
+1. Separate subject from body with a blank line.
+2. Limit the subject line to **50 characters** or less.
+3. Prefix the subject line with a **subsystem name** in square brackets:
+
+   - [android]
+   - [ios]
+   - [qt]
+   - [generator]
+   - [platform]
+   - [storage]
+   - [transit]
+   - [routing]
+   - [bookmarks]
+   - ...
+   - See `git log --oneline|egrep -o '\[[a-z]*\]'|sort|uniq|less` for ideas.
+
+4. Start a sentence with a capital letter.
+5. Do not end the subject line with a period.
+6. Do not put "gh-xx", "closes #xxx" to the subject line.
+7. Use the imperative mood in the subject line.
+
+   - A properly formed Git commit subject line should always be able to complete
+    the following sentence: "If applied, this commit will */your subject line here/*".
+
+8. Wrap the body to **72 characters** or so.
+9. Use the body to explain **what and why** vs. how.
+10. Link GitHub issues on the lasts lines:
+
+    - [See tutorial](https://help.github.com/articles/closing-issues-via-commit-messages).
+
+11. Use your real name and real email address.
+
+    - See also [Developer's Certificate of Origin](DCO.md)
+
+A template:
+
+```
+    [subsystem] Summarize in 50 characters or less
+
+    More detailed explanatory text, if necessary.
+    Wrap it to 72 characters or so.
+    In some contexts, the first line is treated as the subject of the
+    commit, and the rest of the text as the body.
+    The blank line separating the summary from the body is critical
+    (unless you omit the body entirely); various tools like `log`,
+    `shortlog` and `rebase` can get confused if you run the two together.
+
+    Explain the problem that this commit is solving. Focus on why you
+    are making this change as opposed to how (the code explains that).
+    Are there side effects or other unintuitive consequences of this
+    change? Here's the place to explain them.
+
+    Further paragraphs come after blank lines.
+
+    - Bullet points are okay, too.
+
+    - Typically a hyphen or asterisk is used for the bullet, preceded
+      by a single space, with blank lines in between, but conventions
+      vary here.
+
+    Fixes: #123
+    Closes: #456
+    Needed for: #859
+    See also: #343, #789
+```
+
+Based on [Tarantool Guidelines](https://www.tarantool.io/en/doc/latest/dev_guide/developer_guidelines/#how-to-write-a-commit-message).
diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md
index 1b7f81aeb3..c7003d54e8 100644
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -53,16 +53,18 @@ you'll need to create a "data" symlink in the shadow-dir path to the /repo/data
 * Run XCode, open `xcode/omim.xcworkspace`.
 * Select "xcOMaps" scheme and run the product.
 
-## Coding Style
+## Guidelines
 
-See [CPP_STYLE.md](CPP_STYLE.md). Use `clang-format` when in doubt.
+- [C++ Style Guide](CPP_STYLE.md) - use `clang-format` when in doubt.
+- [Objective-C Style Guide](OBJC_STYLE.md).
+- [How to write a commit message](COMMIT_MESSAGES.md).
 
 ## Pull Requests
 
 All contributions to OMaps source code should be submitted via github pull requests.
 Each pull request is reviewed by OMaps maintainers, to ensure consistent code style
 and quality. Sometimes the review process even for smallest commits can be
-very thorough.
+very thorough. Please follow [the developer guidelines](#guidelines).
 
 To contribute you must assure that you have read and are following the rules
 stated in the [Developers Certificate of Origin](DCO.md) (DCO). We have
diff --git a/docs/OBJC_STYLE.md b/docs/OBJC_STYLE.md
index 633e73085e..35c8a4f244 100755
--- a/docs/OBJC_STYLE.md
+++ b/docs/OBJC_STYLE.md
@@ -1,4 +1,4 @@
-# The official maps.me Objective-C style guide.
+# Objective-C Style Guide
 
 ## Credits