diff --git a/attributes/default.rb b/attributes/default.rb
index 1bc023e..34d0394 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -1,3 +1,7 @@
-default[:awscli][:access_key] = ""
+default[:awscli][:access_key]        = ""
 default[:awscli][:secret_access_key] = ""
-default[:awscli][:region] = "us-east-1"
\ No newline at end of file
+default[:awscli][:region]            = "us-east-1"
+default[:awscli][:complete]          = true
+default[:awscli][:user]              = "root"
+default[:awscli][:user_home]         = "/root"
+default[:awscli][:version]           = "latest"
diff --git a/recipes/default.rb b/recipes/default.rb
index d783a01..1a8944f 100644
--- a/recipes/default.rb
+++ b/recipes/default.rb
@@ -3,21 +3,35 @@
 # Recipe:: default
 #
 # Copyright (C) 2013 Nils De Moor
-# 
+#
 # All rights reserved - Do Not Redistribute
 #
 
 include_recipe "python"
 
+
 python_pip "awscli" do
   action :install
+  version node[:awscli][:version]
+end
+
+if node[:awscli][:complete]
+  file '/etc/profile.d/awscli.sh' do
+    owner "root"
+    group "root"
+    mode 00644
+    content 'complete -C aws_completer aws'
+  end
 end
 
-directory "/root/.aws" do
+directory "#{node[:awscli][:user_home]}/.aws" do
   action :create
+  owner node[:awscli][:user]
 end
 
-template "root/.aws/config" do
+template "#{node[:awscli][:user_home]}/.aws/config" do
   source "config.erb"
   action :create
+  owner node[:awscli][:user]
+  mode 0600
 end