diff --git a/dotfiles/bashrc b/dotfiles/bashrc
index 74b5f0a..66dec01 100755
--- a/dotfiles/bashrc
+++ b/dotfiles/bashrc
@@ -13,6 +13,18 @@ done
 export ORACLE_HOME=/usr/lib/oracle/xe/app/oracle/product/10.2.0/server/
 export LD_LIBRARY_PATH=$ORACLE_HOME/lib
 
+# Rakefile completion
+export COMP_WORDBREAKS=${COMP_WORDBREAKS/\:/}
+ 
+function _check_rakefile() {
+  if [ ! -e Rakefile ]; then
+    return
+  fi
+ 
+  local tasks=`rake --silent -T | awk '{print $2}'`
+  COMPREPLY=( $(compgen -W "${tasks}" -- $2) )
+}
+complete -F _check_rakefile -o default rake
 
 # Genereric bash configuration (with color) below:
 # =============================================================================
diff --git a/installation.sh b/installation.sh
index bc4960e..0456283 100644
--- a/installation.sh
+++ b/installation.sh
@@ -17,6 +17,7 @@ sudo apt-get install \
   libxml-ruby \
   libxslt-ruby \
   libxslt-dev \
+  graphviz \
   -y
 
 # Get the project it comes from and install it
@@ -70,4 +71,5 @@ sudo gem install \
   faker \
   railroad \
   ya2yaml \
-  giraffesoft-resource_controller
+  giraffesoft-resource_controller \
+  hpricot