diff --git a/README.md b/README.md
index b4d1b95..b397973 100644
--- a/README.md
+++ b/README.md
@@ -121,6 +121,7 @@ or don't want to see. All options must be overridden in your **.zshrc** file.
 |Variable|Default|Meaning
 |--------|-------|-------|
 |`BULLETTRAIN_TIME_SHOW`|`true`|Show/hide that segment
+|`BULLETTRAIN_TIME_12HR`|`false`|Format time using 12-hour clock (am/pm)
 |`BULLETTRAIN_TIME_BG`|`''`|Background color
 |`BULLETTRAIN_TIME_FG`|`''`|Foreground color
 
diff --git a/bullet-train.zsh-theme b/bullet-train.zsh-theme
index ec38f92..df389c5 100644
--- a/bullet-train.zsh-theme
+++ b/bullet-train.zsh-theme
@@ -369,7 +369,11 @@ prompt_time() {
     return
   fi
 
-  prompt_segment $BULLETTRAIN_TIME_BG $BULLETTRAIN_TIME_FG '%D{%H:%M:%S}'
+  if [[ $BULLETTRAIN_TIME_12HR == true ]] then
+    prompt_segment $BULLETTRAIN_TIME_BG $BULLETTRAIN_TIME_FG %D{%r}
+  else
+    prompt_segment $BULLETTRAIN_TIME_BG $BULLETTRAIN_TIME_FG %D{%R}
+  fi
 }
 
 # Status: