diff --git a/home/bashrc b/home/bashrc
index 327f8cb..ca0ced8 100644
--- a/home/bashrc
+++ b/home/bashrc
@@ -9,6 +9,7 @@ shopt -s histappend
 shopt -s checkwinsize
 #shopt -s physical # chaselinks (doesn't exist?)
 set -o hashall # enable hash command
+set +o histexpand # disable expansion of ! characters
 
 [ "$TERM" != rxvt-unicode-256color ] || export TERM=xterm-256color
 
diff --git a/home/zshrc b/home/zshrc
index 74ea21c..c917d32 100644
--- a/home/zshrc
+++ b/home/zshrc
@@ -33,6 +33,7 @@ setopt no_match                 # error on bad tab-complete
 setopt path_dirs                # Perform path search even on command names with slashes.
 setopt rc_quotes                # 'it''s okay' becomes "it's okay"
 unsetopt flow_control           # Disable start/stop characters in shell editor.
+unsetopt bang_hist              # this does nothing but cause me grief (disables !s)
 
 function {
     if [ "$SHLVL" -le 1 ] \