diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index ade189f..227848e 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -1,20 +1,21 @@
 import 'compile/python'
 
 name=setuptools
-version=30.2.0
+version=30.4.0
 update_url="https://github.com/pypa/$name/releases"
 
 define_option 'easy_install-symlink: Install the easy_install symlink (it may conflict with python2)'
 
 dlextract "https://github.com/pypa/$name/archive/v$version.tar.gz" \
-          'asdf'
+          '66daca0f27b81ca20a5faa0a70be19e0'
 header_end
 
 cd "$name-$version"
 
 # Don't install the regular easy_install, as it conflicts with python 2
-option !easy_install sed -i -e '/easy_install =/d' setup.py
+option !easy_install-symlink sed -i -e '/easy_install =/d' setup.py
 
+python3 bootstrap.py
 compile_python 3
 
 # vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/volumeicon.sat b/satellites/volumeicon.sat
index a56a17e..95d5b6d 100644
--- a/satellites/volumeicon.sat
+++ b/satellites/volumeicon.sat
@@ -16,8 +16,7 @@ fi
 header_end
 
 cd "$name-$version"
-sed -i -e 's/-DCOMPILEWITH_NOTIFY/ &/' ./configure.ac
-sed -i -e 's/-DCOMPILEWITH_NOTIFY/ &/' ./configure
+sed -i -e 's/-DCOMPILEWITH_NOTIFY/ &/' ./configure.ac ./configure
 
 if option !gtk3; then
     patch -p2 -i ../gtk2.patch