diff --git a/LICENSE.md b/LICENSE.md
new file mode 100644
index 0000000..d472003
--- /dev/null
+++ b/LICENSE.md
@@ -0,0 +1,24 @@
+BSD 2-Clause License
+
+Copyright (c) 2005-2022 Velizar VESSELINOV and contributors
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
diff --git a/MANIFEST.in b/MANIFEST.in
index 9a97922..c181fc1 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,3 +1,4 @@
 include README.md
+include LICENSE.md
 include uom/uom.csv
 include requirements.txt
diff --git a/setup.py b/setup.py
index bbe4af8..3ff014a 100644
--- a/setup.py
+++ b/setup.py
@@ -17,7 +17,7 @@ def readme():
 
 
 setup(name='uom',
-      version='0.6.0',
+      version='0.6.1',
       description='Unit of Measure conversion tool',
       long_description=readme(),
       long_description_content_type='text/markdown',
@@ -26,7 +26,7 @@ def readme():
                    'Intended Audience :: Customer Service',
                    'Intended Audience :: Developers',
                    'Intended Audience :: Science/Research',
-                   'License :: OSI Approved :: MIT License',
+                   'License :: OSI Approved :: BSD License',
                    'Programming Language :: Python :: 3.6',
                    'Programming Language :: Python :: 3.7',
                    'Programming Language :: Python :: 3.8',
@@ -34,13 +34,15 @@ def readme():
                    'Programming Language :: Python :: 3.10',
                    'Topic :: Scientific/Engineering',
                    'Topic :: Scientific/Engineering :: Information Analysis'],
-      keywords='uom unit measurement measure energistics oilfield',
+      keywords='uom unit measurement measure Energistics oilfield',
       url='http://github.com/schlumberger/UOM',
       author='Velizar VESSELINOV',
       author_email='vvesselinov@slb.com',
-      license='MIT',
+      license='BSD 2-Clause “Simplified” License',
+      license_file='LICENSE.md',
       packages=['uom'],
       install_requires=requirements(),
+      python_requires='>=3.6',
       test_suite='uom.tests',
       entry_points={
           'console_scripts': ['uom_convert_value=uom.cmd_line:cmd_convert',