diff --git a/Brewfile b/Brewfile
index f306526..8fb86d6 100644
--- a/Brewfile
+++ b/Brewfile
@@ -13,6 +13,7 @@ brew "gitstatus"
 brew "gpg"
 brew "heroku"
 brew "imagemagick"
+brew "mackup"
 brew "mas"
 brew "postgresql"
 brew "pv"
diff --git a/lib/mackup.sh b/lib/mackup.sh
new file mode 100755
index 0000000..730cc68
--- /dev/null
+++ b/lib/mackup.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+mackup restore
diff --git a/setup.sh b/setup.sh
index 554dd87..81d8a3f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -57,6 +57,10 @@ brew bundle --file="$MAC_SETUP_DIR/Brewfile"
 step "Installing dotfiles"
 "$MAC_SETUP_DIR/lib/dotfiles.sh"
 
+# Mackup
+step "Restoring config files"
+"$MAC_SETUP_DIR/lib/mackup.sh"
+
 # Change the shell
 step "Changing shell to zsh"
 "$MAC_SETUP_DIR/lib/shell.sh"