diff --git a/README.rst b/README.rst
index 562fd51..fa422f7 100644
--- a/README.rst
+++ b/README.rst
@@ -267,6 +267,19 @@
 ``/etc/skel/.bashrc``). This formula will do this automatically, but will not
 touch existing user's ``~/.bashrc`` files except root.
 
+Bash
+~~~~
+
+Fix bash configuration to preserve history across sessions (like ZSH does by
+default).
+
+.. code-block:: yaml
+
+    linux:
+      system:
+        bash:
+          preserve_history: true
+
 Message of the day
 ~~~~~~~~~~~~~~~~~~
 
diff --git a/linux/files/bash_history.sh b/linux/files/bash_history.sh
new file mode 100644
index 0000000..b81b09a
--- /dev/null
+++ b/linux/files/bash_history.sh
@@ -0,0 +1,12 @@
+{%- from "linux/map.jinja" import system with context %}
+
+# History across sessions for Bash
+if [ -n "$BASH_VERSION" ]; then
+  # Avoid duplicates
+  export HISTCONTROL=ignoredups:erasedups
+  # When the shell exits, append to the history file instead of overwriting it
+  shopt -s histappend
+
+  # After each command, append to the history file and reread it
+  export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}history -a; history -c; history -r"
+fi
diff --git a/linux/system/bash.sls b/linux/system/bash.sls
new file mode 100644
index 0000000..c54825f
--- /dev/null
+++ b/linux/system/bash.sls
@@ -0,0 +1,11 @@
+{%- from "linux/map.jinja" import system with context %}
+{%- if system.enabled %}
+
+{%- if system.bash.get('preserve_history', False) %}
+/etc/profile.d/bash_history.sh:
+  file.managed:
+    - source: salt://linux/files/bash_history.sh
+    - template: jinja
+{%- endif %}
+
+{%- endif %}
diff --git a/linux/system/init.sls b/linux/system/init.sls
index 92cd0f7..2d8517d 100644
--- a/linux/system/init.sls
+++ b/linux/system/init.sls
@@ -18,6 +18,9 @@
 {%- if system.prompt is defined %}
 - linux.system.prompt
 {%- endif %}
+{%- if system.bash is defined %}
+- linux.system.bash
+{%- endif %}
 {%- if system.user|length > 0 %}
 - linux.system.user
 {%- endif %}