8 files changed, 17 insertions, 13 deletions
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
index dc2ce606..1aecca73 100644
--- a/CHANGELOG.adoc
+++ b/CHANGELOG.adoc
@@ -13,7 +13,7 @@ endif::[]
 This document provides a high-level view of the changes introduced in Asciidoctor by release.
 For a detailed view of what has changed, refer to the {uri-repo}/commits/master[commit history] on GitHub.
 
-== Unreleased
+== 1.5.7 (2018-05-02) - @mojavelinux
 
 Enhancements::
 
diff --git a/README-fr.adoc b/README-fr.adoc
index b5b977fc..95086e18 100644
--- a/README-fr.adoc
+++ b/README-fr.adoc
@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7, 2018-05-02
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.6.1
+:release-version: 1.5.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
diff --git a/README-jp.adoc b/README-jp.adoc
index 101a5ef3..ed706573 100644
--- a/README-jp.adoc
+++ b/README-jp.adoc
@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7, 2018-05-02
 // settings:
 :page-layout: base
 :idprefix:
@@ -17,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.6.1
+:release-version: 1.5.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
diff --git a/README-zh_CN.adoc b/README-zh_CN.adoc
index 43928cb2..646d5626 100644
--- a/README-zh_CN.adoc
+++ b/README-zh_CN.adoc
@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7, 2018-05-02
 // settings:
 :page-layout: base
 :idprefix:
@@ -17,7 +18,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.6.1
+:release-version: 1.5.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
diff --git a/README.adoc b/README.adoc
index f0e7dd17..1255e261 100644
--- a/README.adoc
+++ b/README.adoc
@@ -1,5 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>; Ryan Waldron <https://github.com/erebor[@erebor]>
+v1.5.7, 2018-05-02
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 1.5.6.2
+:release-version: 1.5.7
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor
diff --git a/lib/asciidoctor/version.rb b/lib/asciidoctor/version.rb
index 574c68cc..97f836a2 100644
--- a/lib/asciidoctor/version.rb
+++ b/lib/asciidoctor/version.rb
@@ -1,3 +1,3 @@
 module Asciidoctor
-  VERSION = '1.5.7.dev'
+  VERSION = '1.5.7'
 end
diff --git a/man/asciidoctor.1 b/man/asciidoctor.1
index cb7951db..2f80fb19 100644
--- a/man/asciidoctor.1
+++ b/man/asciidoctor.1
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White, Ryan Waldron
-.\" Generator: Asciidoctor 1.5.7.dev
-.\"      Date: 2018-04-20
+.\" Generator: Asciidoctor 1.5.7
+.\"      Date: 2018-05-02
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 1.5.6.2
+.\"    Source: Asciidoctor 1.5.7
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2018-04-20" "Asciidoctor 1.5.6.2" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2018-05-02" "Asciidoctor 1.5.7" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0
@@ -50,7 +50,7 @@ When combined with the safe mode setting, can be used to chroot the execution of
 \fB\-S, \-\-safe\-mode\fP=\fISAFE_MODE\fP
 .RS 4
 Set safe mode level: \fIunsafe\fP, \fIsafe\fP, \fIserver\fP or \fIsecure\fP.
-Disables potentially dangerous macros in source files, such as \f[CR]include::[]\fP.
+Disables potentially dangerous macros in source files, such as \f(CRinclude::[]\fP.
 If not set, the safe mode level defaults to \fIunsafe\fP when Asciidoctor is invoked using this script.
 .RE
 .sp
@@ -208,7 +208,7 @@ Dump the Asciidoctor man page (in troff/groff format) if \fITOPIC\fP is \fImanpa
 .RS 4
 Print program version number.
 .sp
-\f[CR]\-v\fP can also be used if no other flags or arguments are present.
+\f(CR\-v\fP can also be used if no other flags or arguments are present.
 .RE
 .SH "ENVIRONMENT"
 .sp
diff --git a/man/asciidoctor.adoc b/man/asciidoctor.adoc
index 0c9089aa..230af91d 100644
--- a/man/asciidoctor.adoc
+++ b/man/asciidoctor.adoc
@@ -2,7 +2,7 @@
 Dan Allen; Sarah White; Ryan Waldron
 :doctype: manpage
 :man manual: Asciidoctor Manual
-:man source: Asciidoctor 1.5.6.2
+:man source: Asciidoctor 1.5.7
 :page-layout: base
 
 == NAME