diff --git a/CHANGELOG.md b/CHANGELOG.md
index cc8da0ae..aa1b3aef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,10 @@
 The `ram` segment was split up into `ram` and `swap`. The `POWERLEVEL9K_RAM_ELEMENTS`
 variable is void.
 
+### New segment `aws_eb_env` added
+
+This segment displays the current Elastic Beanstalk environment.
+
 ## v0.3.1
 
 ### `dir` changes
diff --git a/README.md b/README.md
index 07f5ad50..1fcd8086 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 ## powerlevel9k Theme for ZSH
 
+[![Join the chat at https://gitter.im/bhilburn/powerlevel9k](https://badges.gitter.im/bhilburn/powerlevel9k.svg)](https://gitter.im/bhilburn/powerlevel9k?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Powerlevel9k is a theme for ZSH which uses [Powerline
 Fonts](https://github.com/powerline/fonts). It can be used with vanilla ZSH or
 ZSH frameworks such as [Oh-My-Zsh](https://github.com/robbyrussell/oh-my-zsh),
@@ -81,6 +83,7 @@ your `~/.zshrc`:
 The segments that are currently available are:
 
 * [aws](#aws) - The current AWS profile, if active.
+* **aws_eb_env** - The current Elastic Beanstalk Environment.
 * [background_jobs](#background_jobs) - Indicator for background jobs.
 * [battery](#battery) - Current battery status.
 * [context](#context) - Your username and host.
diff --git a/functions/icons.zsh b/functions/icons.zsh
index f00ee5c9..e7dc3bfa 100644
--- a/functions/icons.zsh
+++ b/functions/icons.zsh
@@ -29,6 +29,7 @@ case $POWERLEVEL9K_MODE in
       ROOT_ICON                      $'\UE801'              # 
       RUBY_ICON                      $'\UE847 '             # 
       AWS_ICON                       $'\UE895'              # 
+      AWS_EB_ICON                    $'\U1F331 '            # 🌱
       BACKGROUND_JOBS_ICON           $'\UE82F '             # 
       TEST_ICON                      $'\UE891'              # 
       TODO_ICON                      $'\U2611'              # ☑
@@ -82,6 +83,7 @@ case $POWERLEVEL9K_MODE in
       ROOT_ICON                      $'\uF201'              # 
       RUBY_ICON                      $'\UF219 '             # 
       AWS_ICON                       $'\UF296'              # 
+      AWS_EB_ICON                    $'\U1F331 '            # 🌱
       BACKGROUND_JOBS_ICON           $'\UF013 '             # 
       TEST_ICON                      $'\UF291'              # 
       TODO_ICON                      $'\U2611'              # ☑
@@ -131,6 +133,7 @@ case $POWERLEVEL9K_MODE in
       ROOT_ICON                      $'\u26A1'              # ⚡
       RUBY_ICON                      ''
       AWS_ICON                       'AWS:'
+      AWS_EB_ICON                    $'\U1F331 '            # 🌱
       BACKGROUND_JOBS_ICON           $'\u2699'              # ⚙
       TEST_ICON                      ''
       TODO_ICON                      $'\U2611'              # ☑
diff --git a/powerlevel9k.zsh-theme b/powerlevel9k.zsh-theme
index 904d3d39..f48f97b2 100755
--- a/powerlevel9k.zsh-theme
+++ b/powerlevel9k.zsh-theme
@@ -302,6 +302,15 @@ prompt_aws() {
   fi
 }
 
+# Current Elastic Beanstalk environment
+prompt_aws_eb_env() {
+  local eb_env=$(grep environment .elasticbeanstalk/config.yml 2> /dev/null | awk '{print $2}')
+
+  if [[ -n "$eb_env" ]]; then
+    "$1_prompt_segment" "$0" "$2" black green "$eb_env" 'AWS_EB_ICON'
+  fi
+}
+
 # Segment to indicate background jobs with an icon.
 set_default POWERLEVEL9K_BACKGROUND_JOBS_VERBOSE true
 prompt_background_jobs() {