diff --git a/lib/solaar/__init__.py b/lib/solaar/__init__.py
index 2eae92aa..d4a2c679 100644
--- a/lib/solaar/__init__.py
+++ b/lib/solaar/__init__.py
@@ -16,5 +16,11 @@
 ## with this program; if not, write to the Free Software Foundation, Inc.,
 ## 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
-__version__ = '1.1.7'
+__version_short__ = '1.1.7'
 NAME = 'Solaar'
+
+try:
+    import gitinfo
+    __version__ = __version_short__ + '-' + gitinfo.get_git_info()['commit'][:8]
+except Exception:
+    __version__ = __version_short__
diff --git a/setup.py b/setup.py
index 7b564dfa..4c197152 100755
--- a/setup.py
+++ b/setup.py
@@ -11,7 +11,7 @@ main_ns = {}
 with open('lib/solaar/__init__.py') as ver_file:
     exec(ver_file.read(), main_ns)
 NAME = main_ns['NAME']
-__version__ = main_ns['__version__']
+__version__ = main_ns['__version_short__']
 
 
 def _data_files():
@@ -72,6 +72,7 @@ For instructions on installing Solaar see https://pwr-solaar.github.io/Solaar/in
     extras_require={
         'report-descriptor': ['hid-parser'],
         'desktop-notifications': ['Notify (>= 0.7)'],
+        'git-commit': ['python-git-info'],
     },
     package_dir={'': 'lib'},
     packages=['keysyms', 'hidapi', 'logitech_receiver', 'solaar', 'solaar.ui', 'solaar.cli'],