diff --git a/README.md b/README.md
index c9dd9b7..b8ca13b 100644
--- a/README.md
+++ b/README.md
@@ -5,35 +5,24 @@ This documents talks about installing mailiverse from an origin to a target.
 
 ------- Requirements on the origin build machine ---------
 
-To install from and build mailiverse from the origin, the origin must
-have "git", "ant", "rsync" and "oracle java" installed.  (Other javas might work, but I have
-not tested them.)  Also, your hosts file must point to mail.target and target.
+To install from and build mailiverse from the origin, the origin must:
 
-I have always used Ubuntu 12.04 or 13 as my target machine.
-The build works on Ubuntu 12.04 and also OSX (with dev tools).
-
-
-To install git:
+1. Have git installed
 sudo apt-get install git --yes
 
-
-To install zip:
+2. Have unzip installed
 sudo apt-get install unzip --yes
 
-
-To install ant:
+3. Have ant installed
 sudo apt-get install ant --yes
 
-Clone the mailiverse:
+4. Clone the mailiverse:
 git clone https://github.com/timprepscius/mailiverse.git
 
+5. Have oracle java installed
+cd mailiverse/install && sudo ./setup-java.remote
 
-To install java:
-cd mailiverse/install
-sudo ./setup-java.remote
-
-
-To make the hosts file point to the correct place:
+6.  Add lines to the hosts file for the target machine
 sudo nano /etc/hosts
 add the lines:
 SOME-IP-ADDRESS mail.whateverthenameofyourdomainis
diff --git a/install/enable-passwordless-sudo b/install/enable-passwordless-sudo
new file mode 100755
index 0000000..35c19dd
--- /dev/null
+++ b/install/enable-passwordless-sudo
@@ -0,0 +1,8 @@
+if [ -z "$1" ]; then echo "Must supply name"; exit 0; fi
+
+set -x
+M_ROOT=`cat requirements/server_root_account`
+M_HOST=$1
+
+scp enable-passwordless-sudo.remote $M_ROOT@$M_HOST:
+ssh $M_ROOT@$M_HOST sudo ./enable-passwordless-sudo.remote $M_ROOT
diff --git a/install/enable-passwordless-sudo.remote b/install/enable-passwordless-sudo.remote
new file mode 100755
index 0000000..48b97a0
--- /dev/null
+++ b/install/enable-passwordless-sudo.remote
@@ -0,0 +1,5 @@
+echo "
+$1 ALL=(ALL) NOPASSWD: ALL
+" >> /etc/sudoers.d/$1
+
+chmod 0440 /etc/sudoers.d/$1
diff --git a/setup-2-install b/setup-2-install
index 20c77a9..8efe438 100755
--- a/setup-2-install
+++ b/setup-2-install
@@ -51,6 +51,7 @@ read dummy1
 
 pushd install
 ./enable-passwordless-login $target
+./enable-passwordless-sudo $target
 
 echo '
 Hopefully that went well, if it didn-t well, press control-c now