diff --git a/requirements.txt b/requirements.txt
index 456f8d5..6aabc4d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,3 @@
 spicemanip>=0.1.6
 gitpython
 fake-useragent
-git+git://github.com/sopel-irc/sopel@master
diff --git a/setup.py b/setup.py
index 2cad634..a8fa73e 100755
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,6 @@ import os
 import sys
 from setuptools import setup, find_packages
 
-
 if __name__ == '__main__':
     print('Sopel does not correctly load modules installed with setup.py '
           'directly. Please use "pip install .", or add {}/sopel_modules to '
@@ -24,6 +23,27 @@ with open('requirements.txt') as requirements_file:
 with open('dev-requirements.txt') as dev_requirements_file:
     dev_requirements = [req for req in dev_requirements_file.readlines()]
 
+pipcommand = "sudo pip3 install --upgrade"
+pipcommand += " --force-reinstall"
+pipcommand += " git+https://github.com/sopel-irc/sopel@master"
+
+print('Running {} '.format(pipcommand), file=sys.stderr)
+for line in os.popen(pipcommand).read().split('\n'):
+    print(line, file=sys.stderr)
+
+import sopel
+
+# Remove stock modules, if present
+main_sopel_dir = os.path.dirname(os.path.abspath(sopel.__file__))
+modules_dir = os.path.join(main_sopel_dir, 'modules')
+stockdir = os.path.join(modules_dir, "stock")
+if not os.path.exists(stockdir) or not os.path.isdir(stockdir):
+    os.system("sudo mkdir " + stockdir)
+for pathname in os.listdir(modules_dir):
+    path = os.path.join(modules_dir, pathname)
+    if (os.path.isfile(path) and path.endswith('.py') and not path.startswith('_')):
+        os.system("sudo mv " + path + " " + stockdir)
+
 
 setup(
     name='sopel_modules.SpiceBot',