diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index 8629e5972e3..8f3d171a79c 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -1,15 +1,16 @@
-# $OpenBSD: Makefile,v 1.9 2007/12/01 13:35:20 steven Exp $
+# $OpenBSD: Makefile,v 1.10 2008/06/03 23:30:28 wcmaier Exp $
 
-COMMENT=	enhanced interactive Python shell
+COMMENT=		enhanced interactive Python shell
 
-DISTNAME=	ipython-0.8.2
-CATEGORIES=	devel
+MODPY_EGG_VERSION=	0.8.4
+DISTNAME=		ipython-${MODPY_EGG_VERSION}
+CATEGORIES=		devel
 
-HOMEPAGE=	http://ipython.scipy.org/
+HOMEPAGE=		http://ipython.scipy.org/
 
-MAINTAINER=	Will Maier <willmaier@ml1.net>
+MAINTAINER=		Will Maier <wcmaier@openbsd.org>
 
-MODULES=	lang/python
+MODULES=		lang/python
 
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
@@ -33,7 +34,8 @@ post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/*.1 ${PREFIX}/man/man1
 	${INSTALL_DATA_DIR} ${DOC_DIR}
 	${INSTALL_DATA_DIR} ${EXAMPLE_DIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/manual/* ${DOC_DIR}
+	@cd ${WRKSRC}/doc/manual && pax -rw . ${DOC_DIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/* ${EXAMPLE_DIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/ipython.el ${EXAMPLE_DIR}
 
 .include <bsd.port.mk>
diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo
index d74c5da59ce..fa23f1cb58e 100644
--- a/devel/ipython/distinfo
+++ b/devel/ipython/distinfo
@@ -1,5 +1,5 @@
-MD5 (ipython-0.8.2.tar.gz) = /VobblGImKSu6LjYtCivcA==
-RMD160 (ipython-0.8.2.tar.gz) = l22FEtaO1OG/KKtQ6QvLd3fDTlM=
-SHA1 (ipython-0.8.2.tar.gz) = KSPB95DUGurNJEKvXeirYcQ/YWc=
-SHA256 (ipython-0.8.2.tar.gz) = zGc8fN7zj3qyHuIue+Wlkba27aWQuC9xp0/4tRA4McQ=
-SIZE (ipython-0.8.2.tar.gz) = 1172098
+MD5 (ipython-0.8.4.tar.gz) = m4tDnSld76aUufv3mSA2gA==
+RMD160 (ipython-0.8.4.tar.gz) = NFw0YfQWbsSV64TFgs9lxbsR1uI=
+SHA1 (ipython-0.8.4.tar.gz) = aLdmbSxVL+L1+HPLBu6II+cWX44=
+SHA256 (ipython-0.8.4.tar.gz) = jma2eRNBXsspNm4g03kpki6d8qM+UmhN2c39zOyGfD4=
+SIZE (ipython-0.8.4.tar.gz) = 1161945
diff --git a/devel/ipython/pkg/PLIST b/devel/ipython/pkg/PLIST
index 99c3e50a2e3..c3e5d9e7ec3 100644
--- a/devel/ipython/pkg/PLIST
+++ b/devel/ipython/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.6 2007/12/01 13:35:20 steven Exp $
+@comment $OpenBSD: PLIST,v 1.7 2008/06/03 23:30:28 wcmaier Exp $
 bin/ipython
 bin/irunner
 bin/pycolor
@@ -40,6 +40,10 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipipe.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipipe.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_app_completers.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_app_completers.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_autoreload.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_autoreload.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_bzr.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_bzr.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_completers.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_completers.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_constants.py
@@ -56,12 +60,18 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_fsops.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_fsops.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_gnuglobal.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_gnuglobal.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_host_completers.py
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_host_completers.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_greedycompleter.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_greedycompleter.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_jot.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_jot.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_kitcfg.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_kitcfg.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_legacy.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_legacy.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_leo.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_leo.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_lookfor.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_lookfor.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_p4.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_p4.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_profile_doctest.py
@@ -78,10 +88,10 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_pydb.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_pydb.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_rehashdir.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_rehashdir.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_remote_completer.py
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_remote_completer.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_render.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_render.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_server.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_server.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_signals.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_signals.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_stock_completers.py
@@ -90,8 +100,12 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_system_conf.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_system_conf.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_traits_completer.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_traits_completer.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_vimserver.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_vimserver.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_which.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_which.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_winpdb.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_winpdb.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_workdir.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_workdir.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/jobctrl.py
@@ -100,8 +114,6 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ledit.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ledit.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/numeric_formats.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/numeric_formats.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/path.py
-lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/path.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pickleshare.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pickleshare.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/pspersistence.py
@@ -136,6 +148,7 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Shell.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Shell.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipy_user_conf.py
+lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipy_user_conf.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipythonrc
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipythonrc-math
 lib/python${MODPY_VERSION}/site-packages/IPython/UserConfig/ipythonrc-numeric
@@ -152,6 +165,8 @@ lib/python${MODPY_VERSION}/site-packages/IPython/deep_reload.py
 lib/python${MODPY_VERSION}/site-packages/IPython/deep_reload.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/demo.py
 lib/python${MODPY_VERSION}/site-packages/IPython/demo.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/dtutils.py
+lib/python${MODPY_VERSION}/site-packages/IPython/dtutils.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/excolors.py
 lib/python${MODPY_VERSION}/site-packages/IPython/excolors.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/
@@ -159,12 +174,30 @@ lib/python${MODPY_VERSION}/site-packages/IPython/external/__init__.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/__init__.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/mglob.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/mglob.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/external/path.py
+lib/python${MODPY_VERSION}/site-packages/IPython/external/path.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/external/simplegeneric.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/simplegeneric.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/generics.py
 lib/python${MODPY_VERSION}/site-packages/IPython/generics.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/genutils.py
 lib/python${MODPY_VERSION}/site-packages/IPython/genutils.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/__init__.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/__init__.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/__init__.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/ipshell_nonblocking.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/ipshell_nonblocking.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/ipython_history.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/ipython_history.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/ipython_view.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/ipython_view.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/thread_ex.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/thread_ex.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/wxIPython.py
+lib/python${MODPY_VERSION}/site-packages/IPython/gui/wx/wxIPython.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/history.py
 lib/python${MODPY_VERSION}/site-packages/IPython/history.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/hooks.py
@@ -197,66 +230,61 @@ lib/python${MODPY_VERSION}/site-packages/IPython/rlineimpl.py
 lib/python${MODPY_VERSION}/site-packages/IPython/rlineimpl.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/shadowns.py
 lib/python${MODPY_VERSION}/site-packages/IPython/shadowns.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/shellglobals.py
+lib/python${MODPY_VERSION}/site-packages/IPython/shellglobals.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/strdispatch.py
 lib/python${MODPY_VERSION}/site-packages/IPython/strdispatch.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/twshell.py
+lib/python${MODPY_VERSION}/site-packages/IPython/twshell.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/ultraTB.py
 lib/python${MODPY_VERSION}/site-packages/IPython/ultraTB.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/upgrade_dir.py
 lib/python${MODPY_VERSION}/site-packages/IPython/upgrade_dir.pyc
-lib/python${MODPY_VERSION}/site-packages/IPython/usage-fp.py
-lib/python${MODPY_VERSION}/site-packages/IPython/usage-fp.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/usage.py
 lib/python${MODPY_VERSION}/site-packages/IPython/usage.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/wildcard.py
 lib/python${MODPY_VERSION}/site-packages/IPython/wildcard.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/winconsole.py
 lib/python${MODPY_VERSION}/site-packages/IPython/winconsole.pyc
-lib/python${MODPY_VERSION}/site-packages/ipython-0.8.2-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/ipython-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info
 @man man/man1/ipython.1
 @man man/man1/pycolor.1
 share/doc/ipython/
-share/doc/ipython/crossref.png
-share/doc/ipython/footnode.html
-share/doc/ipython/img1.png
-share/doc/ipython/img2.png
-share/doc/ipython/img3.png
-share/doc/ipython/img4.png
-share/doc/ipython/img5.png
-share/doc/ipython/img6.png
-share/doc/ipython/index.html
-share/doc/ipython/manual.css
-share/doc/ipython/manual.html
-share/doc/ipython/next.png
-share/doc/ipython/next_g.png
-share/doc/ipython/node1.html
-share/doc/ipython/node10.html
-share/doc/ipython/node11.html
-share/doc/ipython/node12.html
-share/doc/ipython/node13.html
-share/doc/ipython/node14.html
-share/doc/ipython/node15.html
-share/doc/ipython/node16.html
-share/doc/ipython/node17.html
-share/doc/ipython/node18.html
-share/doc/ipython/node19.html
-share/doc/ipython/node2.html
-share/doc/ipython/node20.html
-share/doc/ipython/node3.html
-share/doc/ipython/node4.html
-share/doc/ipython/node5.html
-share/doc/ipython/node6.html
-share/doc/ipython/node7.html
-share/doc/ipython/node8.html
-share/doc/ipython/node9.html
-share/doc/ipython/prev.png
-share/doc/ipython/prev_g.png
-share/doc/ipython/up.png
-share/doc/ipython/up_g.png
+share/doc/ipython/_static/
+share/doc/ipython/_static/admin.css
+share/doc/ipython/_static/comment.png
+share/doc/ipython/_static/contents.png
+share/doc/ipython/_static/default.css
+share/doc/ipython/_static/doctools.js
+share/doc/ipython/_static/file.png
+share/doc/ipython/_static/hovercomment.png
+share/doc/ipython/_static/interface.js
+share/doc/ipython/_static/jquery.js
+share/doc/ipython/_static/minus.png
+share/doc/ipython/_static/navigation.png
+share/doc/ipython/_static/nocomment.png
+share/doc/ipython/_static/plus.png
+share/doc/ipython/_static/preview.png
+share/doc/ipython/_static/pygments.css
+share/doc/ipython/_static/rightsidebar.css
+share/doc/ipython/_static/searchtools.js
+share/doc/ipython/_static/sphinxdoc.css
+share/doc/ipython/_static/stickysidebar.css
+share/doc/ipython/_static/top.png
+share/doc/ipython/_static/traditional.css
+share/doc/ipython/genindex.html
+share/doc/ipython/ipython.html
+share/doc/ipython/ipython.pdf
+share/doc/ipython/modindex.html
+share/doc/ipython/search.html
 share/examples/ipython/
 share/examples/ipython/example-demo.py
 share/examples/ipython/example-embed-short.py
 share/examples/ipython/example-embed.py
 share/examples/ipython/example-gnuplot.py
 share/examples/ipython/extension.py
+share/examples/ipython/ipy.vim
+share/examples/ipython/ipython.el
 share/examples/ipython/ipython_here_shell_extension.reg
+share/examples/ipython/leo_bridge_demo.leo
 share/examples/ipython/seteditor.py