diff --git a/.psqlrc b/.psqlrc
new file mode 100644
index 0000000..8f56028
--- /dev/null
+++ b/.psqlrc
@@ -0,0 +1,16 @@
+-- feel better on psql
+
+\set QUIET 1
+\pset null '[NULL]'
+
+\set PROMPT1 '%[%033[1m%]%M %n@%/%R%[%033[0m%]%# '
+\set PROMPT2 '[more] %R > '
+
+\timing on
+
+\x auto
+\set VERBOSITY verbose
+\set HISTFILE ~/.psql_history- :DBNAME
+\set HISTCONTROL ignoredups
+\set COMP_KEYWORD_CASE upper
+\unset QUIET
diff --git a/setup.sh b/setup.sh
index cac7b93..b1c0864 100755
--- a/setup.sh
+++ b/setup.sh
@@ -19,6 +19,7 @@ ln -sf "${SRC_DIR}/.bashrc.defaults" "${HOME}/.bashrc.defaults"
 ln -sf "${SRC_DIR}/.gitconfig" "${HOME}/.gitconfig"
 ln -sf "${SRC_DIR}/.gitignore" "${HOME}/.gitignore"
 ln -sf "${SRC_DIR}/httpie/config.json" "${HOME}/.httpie/config.json"
+ln -sf "${SRC_DIR}/.psqlrc" "${HOME}/.psqlrc"
 ln -sf "${SRC_DIR}/ssh_config" "${HOME}/.ssh/config"
 ln -sf "${SRC_DIR}/.tmux.conf" "${HOME}/.tmux.conf"
 ln -sf "${SRC_DIR}/.vimrc.bundles.local" "${HOME}/.vimrc.bundles.local"