diff --git a/Makefile b/Makefile
index 1ef48ea..69e2c4c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 linux: link bash_git_prompt tmux vim
-macos: link link_mac bash_git_prompt brew cask tmux vim
+macos: link link_mac mac_setup bash_git_prompt brew cask tmux vim
 
 link:
 	rm ~/.bash_aliases
@@ -19,6 +19,9 @@ link_mac:
 	rm ~/.hushlogin
 	ln -s ~/Git/dotfiles/macos/.hushlogin ~
 
+mac_setup:
+	./macos/macos_setup.sh
+
 brew:
 	./macos/install_brew.sh
 	sudo chsh -s /usr/local/bin/bash
diff --git a/macos/macos_setup.sh b/macos/macos_setup.sh
index 755362c..6a41958 100755
--- a/macos/macos_setup.sh
+++ b/macos/macos_setup.sh
@@ -68,9 +68,6 @@ defaults write NSGlobalDomain InitialKeyRepeat -int 10
 # Energy saving                                                               #
 ###############################################################################
 
-# Restart automatically if the computer freezes
-sudo systemsetup -setrestartfreeze on
-
 # Sleep the display after 10 minute
 sudo pmset -a displaysleep 10