diff --git a/repo b/repo
index 8b05def..0e9dd03 100755
--- a/repo
+++ b/repo
@@ -993,6 +993,10 @@ def _Version():
   print('       (from %s)' % (__file__,))
   print('git %s' % (ParseGitVersion().full,))
   print('Python %s' % sys.version)
+  uname = platform.uname()
+  print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
+  print('CPU %s (%s)' %
+        (uname.machine, uname.processor if uname.processor else 'unknown'))
   sys.exit(0)
 
 
diff --git a/subcmds/version.py b/subcmds/version.py
index 9231654..91dbe68 100644
--- a/subcmds/version.py
+++ b/subcmds/version.py
@@ -15,7 +15,10 @@
 # limitations under the License.
 
 from __future__ import print_function
+
+import platform
 import sys
+
 from command import Command, MirrorSafeCommand
 from git_command import git, RepoSourceVersion, user_agent
 from git_refs import HEAD
@@ -52,3 +55,7 @@ class Version(Command, MirrorSafeCommand):
     print('git %s' % git.version_tuple().full)
     print('git User-Agent %s' % user_agent.git)
     print('Python %s' % sys.version)
+    uname = platform.uname()
+    print('OS %s %s (%s)' % (uname.system, uname.release, uname.version))
+    print('CPU %s (%s)' %
+          (uname.machine, uname.processor if uname.processor else 'unknown'))