diff --git a/setup.py b/setup.py
index f0dcf3a96..f713c9c81 100644
--- a/setup.py
+++ b/setup.py
@@ -364,8 +364,15 @@ data = [('share/deluge/glade',  glob.glob('glade/*.glade')),
         ('share/applications' , ['deluge.desktop']),
         ('share/pixmaps' , ['deluge.png'])]
 
-for plugin in glob.glob('plugins/*'):
-    data.append( ('share/deluge/' + plugin, glob.glob(plugin + '/*')) )
+# New code to glob plugins and include subdirs:
+for o in os.walk('plugins'):
+    path = o[0]
+    if not path.count('/.'):
+        items = o[2]
+        for x in range(len(items)):
+            items[x] = path + '/' + items[x]
+        data.append( ('share/deluge/' + path, items))
+        #data.append( ('share/deluge/' + plugin, glob.glob(plugin + '/*')) )
 
 setup(name=NAME, fullname=FULLNAME, version=VERSION,
     author=AUTHOR, author_email=EMAIL, description=DESCRIPTION,