diff --git a/salt/version.py b/salt/version.py
index 51ad87e117..ad3553e1da 100644
--- a/salt/version.py
+++ b/salt/version.py
@@ -1,6 +1,7 @@
 import sys
 
-__version__ = '0.10.4'
+__version_info__ = (0, 10, 4)
+__version__ = '.'.join(map(str, __version_info__))
 
 # If we can get a version from Git use that instead, otherwise carry on
 try:
@@ -14,6 +15,7 @@ try:
         out, err = p.communicate()
         if out:
             __version__ = '{0}'.format(out.strip().lstrip('v'))
+            __version_info__ = tuple(__version__.split('-', 1)[0].split('.'))
 except Exception:
     pass