diff --git a/.gitignore b/.gitignore
index 0d20b6487c61e7d1bde93acf4a14b7a89083a16d..ce6cc88120cd7026da9319a9abc334155df92ffb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 *.pyc
+.*.un~
+.DS_Store
+.idea
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..bece2cf2993423719a36807fb8e5e55b5ffd78f6
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,3 @@
+[options]
+setup_requires =
+  setuptools_scm
diff --git a/setup.py b/setup.py
index 2ed24b34aff043b25ba84605ac1a1773b9992484..c851d77c3c48406abbd2a4e99597714587c3a5ef 100644
--- a/setup.py
+++ b/setup.py
@@ -1,11 +1,11 @@
 from setuptools import setup
-from ess import __version__
 
 setup(
     name="ESS Python Tools",
-    version=__version__,
+    use_scm_version=True,
     description="ESS Related Tools for Python",
     url="http://ess-bp.pages.esss.lu.se/ess-python-tools",
+    license="MIT license",
     author="Yngve Levinsen",
     author_email="yngve.levinsen@esss.se",
     install_requires=["scipy", "numpy", "matplotlib"],
@@ -18,8 +18,7 @@ setup(
         # Indicate who your project is intended for
         "Intended Audience :: Science/Research",
         "Topic :: Scientific/Engineering :: Physics",
-        # Pick your license as you wish (should match "license" above)
-        "License :: Other/Proprietary License",
+        "License :: OSI Approved :: MIT License",
         # Specify the Python versions you support here. In particular, ensure
         # that you indicate whether you support Python 2, Python 3 or both.
         "Programming Language :: Python :: 3.6",