diff --git a/CHANGES.rst b/CHANGES.rst
index 5dc0ac56..384dec98 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,11 @@
+pywb 2.6.0b3 changelist
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* Display 'ignoring locales' warning only if locales specified (don't specify any by default)
+
+* Add -V flag to wb-manager and pywb/wayback commands to display current version and exit
+
+
 pywb 2.6.0b2 changelist
 ~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/config.yaml b/config.yaml
index 5522c685..a3b638c0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -17,6 +17,12 @@ enable_memento: true
 # Replay content in an iframe
 framed_replay: true
 
-locales:
-  - en
-  - es
+
+# uncomment and change to set default locale
+# default_locale: en
+
+# uncomment to set available locales
+# locales:
+#  - en
+#  - es
+
diff --git a/pywb/apps/cli.py b/pywb/apps/cli.py
index 7565fa6d..ac5312cc 100644
--- a/pywb/apps/cli.py
+++ b/pywb/apps/cli.py
@@ -2,6 +2,13 @@ from gevent.monkey import patch_all; patch_all()
 from argparse import ArgumentParser
 
 import logging
+import pkg_resources
+
+
+#=============================================================================
+def get_version():
+    """Get version of the pywb"""
+    return "pywb " + pkg_resources.get_distribution("pywb").version
 
 
 #=============================================================================
@@ -40,6 +47,8 @@ class BaseCli(object):
         :param str desc: The description for the application to be started
         """
         parser = ArgumentParser(description=desc)
+        parser.add_argument("-V", "--version", action="version", version=get_version())
+
         parser.add_argument('-p', '--port', type=int, default=default_port,
                             help='Port to listen on (default %s)' % default_port)
         parser.add_argument('-b', '--bind', default='0.0.0.0',
diff --git a/pywb/manager/manager.py b/pywb/manager/manager.py
index fc767b7d..39070b9b 100644
--- a/pywb/manager/manager.py
+++ b/pywb/manager/manager.py
@@ -8,7 +8,7 @@ import re
 import six
 
 from distutils.util import strtobool
-from pkg_resources import resource_string
+from pkg_resources import resource_string, get_distribution
 
 from argparse import ArgumentParser, RawTextHelpFormatter
 
@@ -28,8 +28,12 @@ def get_input(msg):  # pragma: no cover
     return input(msg)
 
 #=============================================================================
+def get_version():
+    """Get version of the pywb"""
+    return "wb-manager " + get_distribution("pywb").version
 
 
+#=============================================================================
 class CollectionsManager(object):
     """ This utility is designed to
 simplify the creation and management of web archive collections
@@ -335,6 +339,8 @@ Create manage file based web archive collections
                             # epilog=epilog,
                             formatter_class=RawTextHelpFormatter)
 
+    parser.add_argument("-V", "--version", action="version", version=get_version())
+
     subparsers = parser.add_subparsers(dest='type')
     subparsers.required = True
 
diff --git a/pywb/rewrite/templateview.py b/pywb/rewrite/templateview.py
index dadd331c..cabe63ce 100644
--- a/pywb/rewrite/templateview.py
+++ b/pywb/rewrite/templateview.py
@@ -126,7 +126,7 @@ class JinjaEnv(object):
         default_locale = default_locale or 'en'
         self.default_locale = default_locale
 
-        if locales_root_dir:
+        if locales:
             try:
                 from babel.support import Translations
                 for loc in locales:
diff --git a/pywb/version.py b/pywb/version.py
index 27669299..6d0f7edb 100644
--- a/pywb/version.py
+++ b/pywb/version.py
@@ -1,4 +1,4 @@
-__version__ = '2.6.0b2'
+__version__ = '2.6.0b3'
 
 if __name__ == '__main__':
     print(__version__)