diff --git a/setup.py b/setup.py
index 4a686ebfe15..26f55de62a2 100755
--- a/setup.py
+++ b/setup.py
@@ -88,6 +88,24 @@ def find_addons():
     for root, _, names in os.walk(join('bin', 'addons'), followlinks=True):
         if '__openerp__.py' in names or '__terp__.py' in names:
             yield basename(root), root
+    #look for extra modules
+    try:
+        empath = os.getenv('EXTRA_MODULES_PATH', '../addons/')
+        for mname in open(join(empath, 'server_modules.list')):
+            mname = mname.strip()
+            if not mname:
+                continue
+
+            terp = join(empath, mname, '__openerp__.py')
+            if not os.path.exists(terp):
+                terp = join(empath, mname, '__terp__.py')
+
+            if os.path.exists(terp):
+                yield mname, join(empath, mname)
+            else:
+                print "Module %s specified, but no valid path." % mname
+    except Exception:
+        pass
 
 def data_files():
     '''Build list of data files to be installed'''