diff --git a/lms/templates/emails/activation_email.txt b/lms/templates/emails/activation_email.txt
index a3ea03af23..eca5effdd6 100644
--- a/lms/templates/emails/activation_email.txt
+++ b/lms/templates/emails/activation_email.txt
@@ -6,7 +6,7 @@ this address into your web browser's address bar:
 % if is_secure:
   https://${ site }/activate/${ key }
 % else:
-  http://ichuang.mitx.mit.edu/activate/${ key }
+  http://edx4edx.mitx.mit.edu/activate/${ key }
 % endif
 
 If you didn't request this, you don't need to do anything; you won't
diff --git a/rakefile b/rakefile
index 6442d60957..74e1da4505 100644
--- a/rakefile
+++ b/rakefile
@@ -112,6 +112,22 @@ task :package do
     FileUtils.mkdir_p(BUILD_DIR)
     
     Dir.chdir(BUILD_DIR) do
+        afterremove = Tempfile.new('afterremove')
+        afterremove.write <<-AFTERREMOVE.gsub(/^\s*/, '')
+        #! /bin/bash
+        set -e
+        set -x
+        
+        # to be a little safer this rm is executed
+        # as the makeitso user
+
+        if [[ -d "#{INSTALL_DIR_PATH}" ]]; then
+            sudo -u makeitso rm -rf "#{INSTALL_DIR_PATH}"
+        fi
+
+        AFTERREMOVE
+        afterremove.close()
+        FileUtils.chmod(0755, afterremove.path)
 
         postinstall = Tempfile.new('postinstall')
         postinstall.write <<-POSTINSTALL.gsub(/^\s*/, '')
@@ -137,6 +153,7 @@ task :package do
         args = ["fakeroot", "fpm", "-s", "dir", "-t", "deb",
             "--verbose",
             "--after-install=#{postinstall.path}",
+            "--after-remove=#{afterremove.path}",
             "--prefix=#{INSTALL_DIR_PATH}",
             "--exclude=**/build/**",
             "--exclude=**/rakefile",