diff --git a/IPython/Extensions/ipy_completers.py b/IPython/Extensions/ipy_completers.py
index e42c263..faedf6f 100644
--- a/IPython/Extensions/ipy_completers.py
+++ b/IPython/Extensions/ipy_completers.py
@@ -12,6 +12,7 @@ import IPython.ipapi
 import glob,os,shlex,sys
 import inspect
 from time import time
+from zipimport import zipimporter
 ip = IPython.ipapi.get()
 
 try:
@@ -86,6 +87,11 @@ def moduleList(path):
 
     if os.path.isdir(path):
         folder_list = os.listdir(path)
+    elif path.endswith('.egg'):
+        try:
+            folder_list = [f for f in zipimporter(path)._files]
+        except:
+            folder_list = []
     else:
         folder_list = []
     #folder_list = glob.glob(os.path.join(path,'*'))
diff --git a/doc/ChangeLog b/doc/ChangeLog
index e440a63..680ba37 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -2,6 +2,9 @@
 
 	* genutils.py: SList.grep supports 'field' argument
 
+	* ipy_completers.py: module completer looks inside
+	.egg zip files (patch by mc). Close #196.
+
 2008-04-09  Ville Vainio <vivainio@gmail.com>
 
 	* deep_reload.py: do not crash on from __future__ import