diff --git a/50-aliases b/50-aliases
new file mode 100644
index 0000000000000000000000000000000000000000..fbd9533e241a25115887d265319bffc2f286760d
--- /dev/null
+++ b/50-aliases
@@ -0,0 +1 @@
+alias ls="ls --color=auto"
diff --git a/91-completion-herbstclient b/91-completion-herbstclient
new file mode 100644
index 0000000000000000000000000000000000000000..3d50a2c7bd846f6314945981ee67d3edc77eb4b8
--- /dev/null
+++ b/91-completion-herbstclient
@@ -0,0 +1,14 @@
+# bash completion for herbstclient
+
+_herbstclient_complete() {
+    local IFS=$'\n'
+    # do not split at =, because BASH would not split at a '='.
+    COMP_WORDBREAKS=${COMP_WORDBREAKS//=}
+    COMPREPLY=(
+        # just call the herbstclient complete .. but without herbstclient as argument
+        $(herbstclient -q complete_shell "$((COMP_CWORD-1))" "${COMP_WORDS[@]:1}")
+    )
+}
+
+complete -F _herbstclient_complete -o nospace herbstclient
+
diff --git a/bashrc b/bashrc
index 7ae4a010dc8bbcf9046cee66cd0c2a314381cfe1..38e7ea574a07da672fa0e743aeb4d3116bbe9d87 100644
--- a/bashrc
+++ b/bashrc
@@ -6,5 +6,3 @@ for rc in ~/bashrc/[0-9][0-9]-*
 do
 	source "$rc"
 done
-
-