diff --git a/doc/source/conf.py b/doc/source/conf.py
index 7cca28574c..1b0121ff67 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -24,8 +24,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import os
-
+import subprocess
 
 # NOTE(dstanek): adds _ to the builtins so keystone modules can be imported
 __builtins__['_'] = str
@@ -153,8 +152,10 @@ man_pages = [
 # If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
 # using the given strftime format.
 #html_last_updated_fmt = '%b %d, %Y'
-git_cmd = "git log --pretty=format:'%ad, commit %h' --date=local -n1"
-html_last_updated_fmt = os.popen(git_cmd).read()
+git_cmd = ["git", "log", "--pretty=format:'%ad, commit %h'", "--date=local",
+    "-n1"]
+html_last_updated_fmt = subprocess.Popen(
+    git_cmd, stdout=subprocess.PIPE).communicate()[0]
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.