diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ddef3f..de1f1a9 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
 - Use -f to force rebuild the source.
 - If build fails don't remove intermediate containers
+- Added bash completion, wget and nano
+- Simplier home creation
 
 ## [0.5.0] - 2016-03-14
 ### Added
diff --git a/Dockerfile b/Dockerfile
old mode 100644
new mode 100755
index a155801..95ec876
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,8 +17,9 @@ RUN apt-get install -y g++-multilib gcc-multilib lib32ncurses5-dev lib32readline
 RUN apt-get install -y ccache rsync tig
 RUN apt-get install -y android-tools-adb android-tools-fastboot
 RUN apt-get install -y bc bsdmainutils file screen
+RUN apt-get install -y bash-completion wget nano
 
-RUN mkdir -p /home/cmbuild && useradd --no-create-home cmbuild && rsync -a /etc/skel/ /home/cmbuild/
+RUN useradd cmbuild && rsync -a /etc/skel/ /home/cmbuild/
 
 RUN mkdir /home/cmbuild/bin
 RUN curl http://commondatastorage.googleapis.com/git-repo-downloads/repo > /home/cmbuild/bin/repo
diff --git a/bash_completion b/bash_completion
new file mode 100644
index 0000000..f637ae9
--- /dev/null
+++ b/bash_completion
@@ -0,0 +1,2 @@
+. android-completion/android
+. android-completion/repo