diff --git a/math/py-rpy/Makefile b/math/py-rpy/Makefile
index d7a6530a30a7e..c940ffc95cd5f 100644
--- a/math/py-rpy/Makefile
+++ b/math/py-rpy/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.33 2014/05/13 17:09:21 joerg Exp $
+# $NetBSD: Makefile,v 1.34 2015/04/07 22:14:18 wiz Exp $
 
-DISTNAME=	rpy2-2.3.0
+DISTNAME=	rpy2-2.5.6
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/rpy2/rpy/}
 CATEGORIES=	math python
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=rpy/}
+MASTER_SITES=	https://pypi.python.org/packages/source/r/rpy2/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://rpy.sourceforge.net/
@@ -18,7 +18,7 @@ LDFLAGS.SunOS+=		-mimpure-text
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
-.include "../../lang/python/distutils.mk"
+.include "../../lang/python/egg.mk"
 .include "../../math/py-numpy/buildlink3.mk"
 .include "../../math/R/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/py-rpy/PLIST b/math/py-rpy/PLIST
index 6cd41751bc6a9..1c82184161a0a 100644
--- a/math/py-rpy/PLIST
+++ b/math/py-rpy/PLIST
@@ -1,17 +1,41 @@
-@comment $NetBSD: PLIST,v 1.13 2014/01/19 22:50:43 wiz Exp $
-${PYSITELIB}/${EGG_FILE}
+@comment $NetBSD: PLIST,v 1.14 2015/04/07 22:14:18 wiz Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/rpy2/__init__.py
 ${PYSITELIB}/rpy2/__init__.pyc
 ${PYSITELIB}/rpy2/__init__.pyo
 ${PYSITELIB}/rpy2/interactive/__init__.py
 ${PYSITELIB}/rpy2/interactive/__init__.pyc
 ${PYSITELIB}/rpy2/interactive/__init__.pyo
+${PYSITELIB}/rpy2/interactive/packages.py
+${PYSITELIB}/rpy2/interactive/packages.pyc
+${PYSITELIB}/rpy2/interactive/packages.pyo
 ${PYSITELIB}/rpy2/interactive/process_revents.py
 ${PYSITELIB}/rpy2/interactive/process_revents.pyc
 ${PYSITELIB}/rpy2/interactive/process_revents.pyo
 ${PYSITELIB}/rpy2/interactive/tests/__init__.py
 ${PYSITELIB}/rpy2/interactive/tests/__init__.pyc
 ${PYSITELIB}/rpy2/interactive/tests/__init__.pyo
+${PYSITELIB}/rpy2/ipython/__init__.py
+${PYSITELIB}/rpy2/ipython/__init__.pyc
+${PYSITELIB}/rpy2/ipython/__init__.pyo
+${PYSITELIB}/rpy2/ipython/ggplot.py
+${PYSITELIB}/rpy2/ipython/ggplot.pyc
+${PYSITELIB}/rpy2/ipython/ggplot.pyo
+${PYSITELIB}/rpy2/ipython/html.py
+${PYSITELIB}/rpy2/ipython/html.pyc
+${PYSITELIB}/rpy2/ipython/html.pyo
+${PYSITELIB}/rpy2/ipython/rmagic.py
+${PYSITELIB}/rpy2/ipython/rmagic.pyc
+${PYSITELIB}/rpy2/ipython/rmagic.pyo
+${PYSITELIB}/rpy2/ipython/tests/__init__.py
+${PYSITELIB}/rpy2/ipython/tests/__init__.pyc
+${PYSITELIB}/rpy2/ipython/tests/__init__.pyo
+${PYSITELIB}/rpy2/ipython/tests/test_rmagic.py
+${PYSITELIB}/rpy2/ipython/tests/test_rmagic.pyc
+${PYSITELIB}/rpy2/ipython/tests/test_rmagic.pyo
 ${PYSITELIB}/rpy2/rinterface/__init__.py
 ${PYSITELIB}/rpy2/rinterface/__init__.pyc
 ${PYSITELIB}/rpy2/rinterface/__init__.pyo
@@ -38,6 +62,9 @@ ${PYSITELIB}/rpy2/rinterface/tests/test_SexpEnvironment.pyo
 ${PYSITELIB}/rpy2/rinterface/tests/test_SexpExtPtr.py
 ${PYSITELIB}/rpy2/rinterface/tests/test_SexpExtPtr.pyc
 ${PYSITELIB}/rpy2/rinterface/tests/test_SexpExtPtr.pyo
+${PYSITELIB}/rpy2/rinterface/tests/test_SexpSymbol.py
+${PYSITELIB}/rpy2/rinterface/tests/test_SexpSymbol.pyc
+${PYSITELIB}/rpy2/rinterface/tests/test_SexpSymbol.pyo
 ${PYSITELIB}/rpy2/rinterface/tests/test_SexpVector.py
 ${PYSITELIB}/rpy2/rinterface/tests/test_SexpVector.pyc
 ${PYSITELIB}/rpy2/rinterface/tests/test_SexpVector.pyo
@@ -98,6 +125,12 @@ ${PYSITELIB}/rpy2/robjects/lib/ggplot2.pyo
 ${PYSITELIB}/rpy2/robjects/lib/grid.py
 ${PYSITELIB}/rpy2/robjects/lib/grid.pyc
 ${PYSITELIB}/rpy2/robjects/lib/grid.pyo
+${PYSITELIB}/rpy2/robjects/lib/tests/__init__.py
+${PYSITELIB}/rpy2/robjects/lib/tests/__init__.pyc
+${PYSITELIB}/rpy2/robjects/lib/tests/__init__.pyo
+${PYSITELIB}/rpy2/robjects/lib/tests/test_ggplot2.py
+${PYSITELIB}/rpy2/robjects/lib/tests/test_ggplot2.pyc
+${PYSITELIB}/rpy2/robjects/lib/tests/test_ggplot2.pyo
 ${PYSITELIB}/rpy2/robjects/methods.py
 ${PYSITELIB}/rpy2/robjects/methods.pyc
 ${PYSITELIB}/rpy2/robjects/methods.pyo
@@ -107,6 +140,12 @@ ${PYSITELIB}/rpy2/robjects/numpy2ri.pyo
 ${PYSITELIB}/rpy2/robjects/packages.py
 ${PYSITELIB}/rpy2/robjects/packages.pyc
 ${PYSITELIB}/rpy2/robjects/packages.pyo
+${PYSITELIB}/rpy2/robjects/packages_utils.py
+${PYSITELIB}/rpy2/robjects/packages_utils.pyc
+${PYSITELIB}/rpy2/robjects/packages_utils.pyo
+${PYSITELIB}/rpy2/robjects/pandas2ri.py
+${PYSITELIB}/rpy2/robjects/pandas2ri.pyc
+${PYSITELIB}/rpy2/robjects/pandas2ri.pyo
 ${PYSITELIB}/rpy2/robjects/robject.py
 ${PYSITELIB}/rpy2/robjects/robject.pyc
 ${PYSITELIB}/rpy2/robjects/robject.pyo
@@ -143,6 +182,9 @@ ${PYSITELIB}/rpy2/robjects/tests/testNumpyConversions.pyo
 ${PYSITELIB}/rpy2/robjects/tests/testPackages.py
 ${PYSITELIB}/rpy2/robjects/tests/testPackages.pyc
 ${PYSITELIB}/rpy2/robjects/tests/testPackages.pyo
+${PYSITELIB}/rpy2/robjects/tests/testPandasConversions.py
+${PYSITELIB}/rpy2/robjects/tests/testPandasConversions.pyc
+${PYSITELIB}/rpy2/robjects/tests/testPandasConversions.pyo
 ${PYSITELIB}/rpy2/robjects/tests/testRObject.py
 ${PYSITELIB}/rpy2/robjects/tests/testRObject.pyc
 ${PYSITELIB}/rpy2/robjects/tests/testRObject.pyo
diff --git a/math/py-rpy/distinfo b/math/py-rpy/distinfo
index 53bb6fd4fef9e..a40b43009499e 100644
--- a/math/py-rpy/distinfo
+++ b/math/py-rpy/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.11 2014/01/19 22:50:43 wiz Exp $
+$NetBSD: distinfo,v 1.12 2015/04/07 22:14:18 wiz Exp $
 
-SHA1 (rpy2-2.3.0.tar.gz) = 57756415b343bfb960f319b53e6387ddbd0e0d08
-RMD160 (rpy2-2.3.0.tar.gz) = f2c70f8f7b242686e04d19c055090d3eb08005a9
-Size (rpy2-2.3.0.tar.gz) = 178022 bytes
+SHA1 (rpy2-2.5.6.tar.gz) = d4a664b21b61b12608d9ff6714a087b43039e89e
+RMD160 (rpy2-2.5.6.tar.gz) = ea13cf5379c025bbd7f8654c2cad0037196cf7a1
+Size (rpy2-2.5.6.tar.gz) = 165070 bytes