diff --git a/install.sh b/install.sh
index 8e14aa5..d317aac 100755
--- a/install.sh
+++ b/install.sh
@@ -24,30 +24,30 @@ FILES=(
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
-# TODO: Install yaourt or else the next thing fails
+# Install base-devel for building aur packages
+echo -e "- Installing packages"
+sudo pacman -S git base-devel --noconfirm
+
+# Install aurman
+git clone https://aur.archlinux.org/aurman.git
+cd aurman
+makepkg -si --noconfirm --skippgpcheck
+cd ..
+rm -rf aurman
 
 # Install packages - "yaourt -Qqe > packages.list"
-yaourt -S $(cat "$DIR/yaourt/packages.list")
-
+#yaourt -S --noconfirm $(cat "$DIR/yaourt/packages.list")
 # Install aur packages - "yaourt -Qqm > packages.aur.list"
-yaourt -S --noconfirm $(cat "$DIR/yaourt/packages.aur.list")
-
-
-# TODO: Create a function that makes the linking easier and that checks if
-# the links already exists
+#yaourt -S --noconfirm $(cat "$DIR/yaourt/packages.aur.list")
 
+# Create symlinks to dotfiles
+echo -e "- Creating symlinks"
 for file in "${FILES[@]}"
 do
    rm -rf "$HOME/$file"
    ln -fs "$DIR/$file" "$HOME/$file"
 done
 
-# ive scripts execute permissions
-chmod +x "$HOME/bin/*"
-
-# Download and install composer
-# TODO: Install this using yaourt
-php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');"
-php composer-setup.php
-php -r "unlink('composer-setup.php');"
-mv "$DIR/composer.phar" "$HOME/bin/composer"
+# Give scripts execute permissions
+echo -e "- Give permissions"
+chmod -R +x "$HOME/bin"
\ No newline at end of file