diff --git a/doc/source/conf.py b/doc/source/conf.py
index aaf0493b..e4947852 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -52,11 +52,11 @@ master_doc = 'index'
 # General information about the project.
 openstackdocs_repo_name = "openstack/operations-guide"
 openstackdocs_use_storyboard = True
-copyright = u'2016-present, OpenStack contributors'
+copyright = '2016-present, OpenStack contributors'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
-# language = None
+language = 'en'
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
@@ -183,8 +183,8 @@ html_copy_source = False
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    ('index', 'OpsGuide.tex', u'Operations Guide',
-     u'OpenStack contributors', 'manual'),
+    ('index', 'OpsGuide.tex', 'Operations Guide',
+     'OpenStack contributors', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -213,8 +213,8 @@ latex_documents = [
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'opsguide', u'Operations Guide',
-     [u'OpenStack contributors'], 1)
+    ('index', 'opsguide', 'Operations Guide',
+     ['OpenStack contributors'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -227,8 +227,8 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    ('index', 'OpsGuide', u'Operations Guide',
-     u'OpenStack contributors', 'OpsGuide',
+    ('index', 'OpsGuide', 'Operations Guide',
+     'OpenStack contributors', 'OpsGuide',
      'This book provides information about designing and operating '
      'OpenStack clouds.', 'Miscellaneous'),
 ]