diff --git a/README.markdown b/README.markdown
index 4dca93c..322a157 100644
--- a/README.markdown
+++ b/README.markdown
@@ -16,7 +16,7 @@ interaction:
     work tree dirty indicator.
   * Customizable via `/etc/gitshrc` and `~/.gitshrc` config files;
     for creating aliases, changing the prompt, etc.
-  * Runs on top of normal bash (`~/.bashrc`) and
+  * Runs on top of normal bash (`~/.bash_profile`) and
     readline (`~/.inputrc`) configurations.
 
 Installation
@@ -56,7 +56,7 @@ used as top-level commands:
     new!mygreatrepo> rebase -i HEAD~10
 
 It's really just a normal bash shell, though, so all commands on `PATH` and any
-aliases defined in `~/.bashrc` are also available:
+aliases defined in `~/.bash_profile` are also available:
 
     new!mygreatrepo> ls -l
     new!mygreatrepo> vim somefile
@@ -99,7 +99,7 @@ files (`~/.gitconfig` and `/etc/gitconfig`) either by hand or using
 The `/etc/gitshrc` and `~/.gitshrc` files are sourced (in that order)
 immediately before the shell becomes interactive.
 
-The `~/.bashrc` file is sourced before either `/etc/gitshrc` or `~/.gitshrc`.
+The `~/.bash_profile` file is sourced before either `/etc/gitshrc` or `~/.gitshrc`.
 Any bash customizations defined there and not explicitly overridden by `git-sh`
 are also available.
 
diff --git a/git-completion.bash b/git-completion.bash
index c609f19..40c799c 100644
--- a/git-completion.bash
+++ b/git-completion.bash
@@ -18,7 +18,7 @@
 # To use these routines:
 #
 #    1) Copy this file to somewhere (e.g. ~/.git-completion.sh).
-#    2) Added the following line to your .bashrc:
+#    2) Added the following line to your .bash_profile:
 #        source ~/.git-completion.sh
 #
 #    3) Consider changing your PS1 to also show the current branch:
diff --git a/git-sh.1.roff b/git-sh.1.roff
index c3f341f..81abc4d 100644
--- a/git-sh.1.roff
+++ b/git-sh.1.roff
@@ -268,7 +268,7 @@ The \fB/etc/gitshrc\fR and \fB~/.gitshrc\fR files are sourced (in that order)
 immediately before the shell becomes interactive.
 .
 .P
-The \fB~/.bashrc\fR file is sourced before either \fB/etc/gitshrc\fR or \fB~/.gitshrc\fR.
+The \fB~/.bash_profile\fR file is sourced before either \fB/etc/gitshrc\fR or \fB~/.gitshrc\fR.
 Any bash customizations defined there and not explicitly overridden by \fBgit\-sh\fR
 are also available.
 .
diff --git a/git-sh.1.ronn b/git-sh.1.ronn
index 5fb7847..e350570 100644
--- a/git-sh.1.ronn
+++ b/git-sh.1.ronn
@@ -175,7 +175,7 @@ files (`~/.gitconfig` and `/etc/gitconfig`) either by hand or using
 The `/etc/gitshrc` and `~/.gitshrc` files are sourced (in that order)
 immediately before the shell becomes interactive.
 
-The `~/.bashrc` file is sourced before either `/etc/gitshrc` or `~/.gitshrc`.
+The `~/.bash_profile` file is sourced before either `/etc/gitshrc` or `~/.gitshrc`.
 Any bash customizations defined there and not explicitly overridden by `git-sh`
 are also available.
 
diff --git a/git-sh.bash b/git-sh.bash
index 1891700..0c01018 100644
--- a/git-sh.bash
+++ b/git-sh.bash
@@ -33,10 +33,10 @@
 [ "$0" = 'bash' ] ||
 exec /usr/bin/env bash --rcfile "$0" "$@"
 
-# source the user's .bashrc file
-[ -r ~/.bashrc ] && {
+# source the user's .bash_profile file
+[ -r ~/.bash_profile ] && {
 	pushd ~ > /dev/null
-	. .bashrc
+	. .bash_profile
 	popd > /dev/null
 }
 
@@ -98,6 +98,7 @@ _git_cmd_cfg=(
 	'diff           alias  stdcmpl'
 	'difftool       alias'
 	'fetch          alias  stdcmpl'
+	'flow			alias'
 	'format-patch   alias  stdcmpl'
 	'fsck           alias'
 	'gc             alias  stdcmpl'