diff --git a/lang/rakudo/Makefile b/lang/rakudo/Makefile
index 4a72bab13c5d..7f6da68eae49 100644
--- a/lang/rakudo/Makefile
+++ b/lang/rakudo/Makefile
@@ -1,61 +1,61 @@
 # New ports collection makefile for:	rakudo
 # Date created:    15 March 2009
 # Whom:            Aliaksandr Zahatski <zahatski@gmail.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	rakudo
-PORTVERSION=	2010.06
+PORTVERSION=	2010.07
 PORTEPOCH=	1
 CATEGORIES=	lang
 MASTER_SITES=	http://cloud.github.com/downloads/rakudo/rakudo/
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	The Rakudo Perl 6 Compiler targets the Parrot Virtual Machine
 
 BUILD_DEPENDS=	parrot>=${PARROT_VERSION}:${PORTSDIR}/lang/parrot
 LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 RUN_DEPENDS=	parrot>=${PARROT_VERSION}:${PORTSDIR}/lang/parrot
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 700000
 BROKEN=	dependency devel/icu is broken on 6.x
 .endif
 
 USE_BISON=	build
 USE_PERL5_BUILD=	5.8.0+
 USE_GMAKE=	yes
 
 INSTALL_TARGET=	install
 
 MAN1=		perl6.1 rakudo.1
 MANCOMPRESSED=	no
 
 PARROTCONFIG?=	${LOCALBASE}/bin/parrot_config
 CONFIGURE_SCRIPT=	Configure.pl
 CONFIGURE_ARGS=	--parrot-config=${PARROTCONFIG}
 PLIST_SUB+=	PARROT_VERSION=${PARROT_VERSION}
 
 do-configure:
 	cd ${WRKSRC} && ${PERL} ${CONFIGURE_SCRIPT} ${CONFIGURE_ARGS}
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/perl6.1 ${MAN1PREFIX}/man/man1/perl6.1
 
 test: build
 	${MAKE} -C ${WRKSRC} test
 
 regression-test: test
 
 x-generate-plist:
 	(${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX} \
 	| ${SED} -E \
 	's,.*share/nls/.+$$,,g \
 	;s,${PARROT_VERSION}(/.+)?$$,%%PARROT_VERSION%%\1,g \
 	' | ${TR} -s '\n') > temp-pkg-plist
 
 .include "${.CURDIR}/../parrot/Makefile.common"
 
 .include <bsd.port.post.mk>
diff --git a/lang/rakudo/distinfo b/lang/rakudo/distinfo
index 47efbb81c777..670f84866e0a 100644
--- a/lang/rakudo/distinfo
+++ b/lang/rakudo/distinfo
@@ -1,3 +1,3 @@
-MD5 (rakudo-2010.06.tar.gz) = 2906a5e269757d596f5c19f1638664bc
-SHA256 (rakudo-2010.06.tar.gz) = f866dd5bf5564658981db81c486ffc091e7f66a3d26ea638a20768f836c754e5
-SIZE (rakudo-2010.06.tar.gz) = 862488
+MD5 (rakudo-2010.07.tar.gz) = 6cc519feeb20bddbbee8cbfe6e8c2a31
+SHA256 (rakudo-2010.07.tar.gz) = 52de9bbc8cfae31cbaf726b9e25492747f1d18f4974590869e6945be30254c19
+SIZE (rakudo-2010.07.tar.gz) = 898984
diff --git a/lang/rakudo/pkg-plist b/lang/rakudo/pkg-plist
index 9401cccebfed..b5664cbb72ce 100644
--- a/lang/rakudo/pkg-plist
+++ b/lang/rakudo/pkg-plist
@@ -1,20 +1,19 @@
 bin/perl6
 lib/parrot/%%PARROT_VERSION%%/dynext/perl6_group.so
 lib/parrot/%%PARROT_VERSION%%/dynext/perl6_ops.so
-lib/parrot/%%PARROT_VERSION%%/languages/perl6/lib/Safe.pm
 lib/parrot/%%PARROT_VERSION%%/languages/perl6/lib/Test.pir
 lib/parrot/%%PARROT_VERSION%%/languages/perl6/lib/Test.pm
 lib/parrot/%%PARROT_VERSION%%/languages/perl6/perl6.pbc
 share/doc/rakudo/CREDITS
 share/doc/rakudo/ChangeLog
 share/doc/rakudo/LICENSE
 share/doc/rakudo/README
 share/doc/rakudo/ROADMAP
 share/doc/rakudo/S11-Modules-proposal.pod
 @dirrm share/doc/rakudo
 @dirrm lib/parrot/%%PARROT_VERSION%%/languages/perl6/lib
 @dirrm lib/parrot/%%PARROT_VERSION%%/languages/perl6
 @dirrmtry lib/parrot/%%PARROT_VERSION%%/languages
 @dirrmtry lib/parrot/%%PARROT_VERSION%%/dynext
 @dirrmtry lib/parrot/%%PARROT_VERSION%%
 @dirrmtry lib/parrot