diff --git a/devel/ipython/Makefile b/devel/ipython/Makefile
index c428a62b72d..edbedb2f557 100644
--- a/devel/ipython/Makefile
+++ b/devel/ipython/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2006/12/20 12:26:29 steven Exp $
+# $OpenBSD: Makefile,v 1.5 2007/04/13 04:50:17 steven Exp $
 
 COMMENT=	"enhanced interactive Python shell"
 
-DISTNAME=	ipython-0.7.3
+DISTNAME=	ipython-0.8.0
 CATEGORIES=	devel
 
 HOMEPAGE=	http://ipython.scipy.org/
diff --git a/devel/ipython/distinfo b/devel/ipython/distinfo
index 3b2af0dde5d..8e77d924c6d 100644
--- a/devel/ipython/distinfo
+++ b/devel/ipython/distinfo
@@ -1,5 +1,5 @@
-MD5 (ipython-0.7.3.tar.gz) = QMvIFLgS8sPWwTtH1BpsxQ==
-RMD160 (ipython-0.7.3.tar.gz) = ike52fiYWyY5Vw69p3ufNBwUKpo=
-SHA1 (ipython-0.7.3.tar.gz) = ke3qSuexpCK8eg5t2d8YUge5Ub4=
-SHA256 (ipython-0.7.3.tar.gz) = Jp/i8iJPh1iORIHaY4PCM7Y6aglqT396vUZI7nkrmoQ=
-SIZE (ipython-0.7.3.tar.gz) = 1095673
+MD5 (ipython-0.8.0.tar.gz) = LqTigNdPHqcoMM16N6Uguw==
+RMD160 (ipython-0.8.0.tar.gz) = +guHX2pphVtaAKprHYUSphSMalQ=
+SHA1 (ipython-0.8.0.tar.gz) = ambtgEtm8nSgGB6BtW+8QvenNfw=
+SHA256 (ipython-0.8.0.tar.gz) = J0/FPVrPdFqWsOENvqsX+RJRxjovfd1IBNGdVxjsAE8=
+SIZE (ipython-0.8.0.tar.gz) = 1119396
diff --git a/devel/ipython/patches/patch-setup_py b/devel/ipython/patches/patch-setup_py
index f0ef9e7950d..1fdd03d8ca0 100644
--- a/devel/ipython/patches/patch-setup_py
+++ b/devel/ipython/patches/patch-setup_py
@@ -1,7 +1,7 @@
-$OpenBSD: patch-setup_py,v 1.2 2006/06/08 14:38:01 steven Exp $
---- setup.py.orig	Wed Jun  7 11:00:19 2006
-+++ setup.py	Wed Jun  7 11:01:22 2006
-@@ -126,13 +126,7 @@ if 'bdist_wininst' in sys.argv:
+$OpenBSD: patch-setup_py,v 1.3 2007/04/13 04:50:18 steven Exp $
+--- setup.py.orig	Sat Apr  7 17:20:59 2007
++++ setup.py	Wed Apr 11 05:47:17 2007
+@@ -126,14 +126,16 @@ if 'bdist_wininst' in sys.argv:
          sys.exit(1)
      scriptfiles.append('scripts/ipython_win_post_install.py')
  
@@ -11,8 +11,18 @@ $OpenBSD: patch-setup_py,v 1.2 2006/06/08 14:38:01 steven Exp $
 -                          ('data', os.path.join(docdirbase, 'manual'),
 -                           manfiles),
 -                          ('data', manpagebase, manpages),
--                          ('lib', 'IPython/UserConfig', cfgfiles)]
+-                          ('lib', 'IPython/UserConfig', cfgfiles),
+-                          ('data','IPython/Extensions', igridhelpfiles)]
++# These files are manually installed by the port's Makefile.
++#datafiles = [('data', docdirbase, docfiles),
++#                          ('data', os.path.join(docdirbase, 'examples'),
++#                           examfiles),
++#                          ('data', os.path.join(docdirbase, 'manual'),
++#                           manfiles),
++#                          ('data', manpagebase, manpages),
++#                          ('lib', 'IPython/UserConfig', cfgfiles),
++#                          ('data','IPython/Extensions', igridhelpfiles)]
 +datafiles = [('lib', 'IPython/UserConfig', cfgfiles),]
- 
  if 'setuptools' in sys.modules:
      # setuptools config for egg building
+     egg_extra_kwds = {
diff --git a/devel/ipython/pkg/PLIST b/devel/ipython/pkg/PLIST
index 5793e86bc2e..bb9527483d4 100644
--- a/devel/ipython/pkg/PLIST
+++ b/devel/ipython/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2006/12/20 12:26:29 steven Exp $
+@comment $OpenBSD: PLIST,v 1.4 2007/04/13 04:50:18 steven Exp $
 bin/ipython
 bin/irunner
 bin/pycolor
@@ -28,16 +28,26 @@ lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/astyle.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/astyle.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/clearcmd.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/clearcmd.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/envpersist.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/envpersist.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rehashdir.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rehashdir.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rescapture.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ext_rescapture.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ibrowse.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ibrowse.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/igrid.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/igrid.pyc
 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_completers.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_completers.pyc
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_defaults.py
 lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_defaults.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_p4.py
+lib/python${MODPY_VERSION}/site-packages/IPython/Extensions/ipy_p4.pyc
 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_signals.py
@@ -113,6 +123,8 @@ 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/simplegeneric.py
 lib/python${MODPY_VERSION}/site-packages/IPython/external/simplegeneric.pyc
+lib/python${MODPY_VERSION}/site-packages/IPython/external/thread2.py
+lib/python${MODPY_VERSION}/site-packages/IPython/external/thread2.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/hooks.py
@@ -156,6 +168,7 @@ lib/python${MODPY_VERSION}/site-packages/IPython/winconsole.pyc
 @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