diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index 08a3921bf60b..e06aa2ab1cde 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -1,73 +1,79 @@
 # New ports collection makefile for:	ode
 # Date created:				11 Oct 2003
 # Whom:					David Yeske <dyeske@yahoo.com>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ode
-PORTVERSION=	0.9
-PORTREVISION=	2
+PORTVERSION=	0.10.1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF
 MASTER_SITE_SUBDIR=	opende
-DISTNAME=	${PORTNAME}-src-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Articulated rigid body dynamics library
 
 CONFLICTS=	ode-devel-[0-9].*
 
-USE_ZIP=	yes
+USE_BZIP2=	yes
 USE_GL=		yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 OPTIONS=	GIMPACT	"Enable gimpact instead of opcode support" off \
 		GYROSCOPIC "Configure ODE to work with gyroscopic term" on \
-		DOUBLE  "Enable double precision (BROKEN with GIMPACT)" off
+		DOUBLE  "Enable double precision (BROKEN with GIMPACT)" off \
+		OU	"Enable Thread-local storage (Experimental)" off
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_GIMPACT) && defined(WITH_DOUBLE)
 IGNORE=	currently double precision is not supported by gimpact
 .endif
 
 .if !defined(WITH_GIMPACT)
 CONFIGURE_ARGS+=	--with-trimesh=opcode
 .else
 CONFIGURE_ARGS+=	--with-trimesh=gimpact
 .endif
 
 .if defined(WITHOUT_GYROSCOPIC)
 CONFIGURE_ARGS+=	--disable-gyroscopic
 .endif
 
 .if defined(WITH_DOUBLE)
 CONFIGURE_ARGS+=	--enable-double-precision
 .endif
 
+.if defined(WITH_OU)
+CONFIGURE_ARGS+=	--enable-ou
+.else
+CONFIGURE_ARGS+=	--disable-ou
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e '/if test/ s|==|=|' -e 's|^\( *CFLAGS=\)|#\1|;' \
 		-e 's|^\( *CPPFLAGS=\)|#\1|' -e 's|^\( *CXXFLAGS=\)|#\1|' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|__isnanf||g; s|__isnan||g' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/^traplib_PROGRAMS / d' ${WRKSRC}/ode/src/Makefile.in
 	@${FIND} ${WRKSRC} -type f -name Makefile.in -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 		-e '/^DEFAULT_INCLUDES/ s|$$| -I$$(top_builddir)/include|' \
 		-e '/CFLAGS/ s|-O[12]||'
 	@${FIND} ${WRKSRC} -type f -print0 | ${XARGS} -0 ${REINPLACE_CMD} \
 		-i "" -e 's|malloc.h|stdlib.h|g'
 
 post-install:
-	${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/include/ode/config.h \
+	${SED} -e '/PACKAGE/ s|^|//|; /VERSION/ s|^|//|' ${WRKSRC}/ode/src/config.h \
 		> ${PREFIX}/include/ode/config.h
 
 .include <bsd.port.post.mk>
diff --git a/devel/ode/distinfo b/devel/ode/distinfo
index e413f36fb0f3..4b00e507597f 100644
--- a/devel/ode/distinfo
+++ b/devel/ode/distinfo
@@ -1,3 +1,3 @@
-MD5 (ode-src-0.9.zip) = 4c03759b76a0649a6d5108c8e172e1e4
-SHA256 (ode-src-0.9.zip) = 460d0851b743b1f144ef2a8259004d6774504c95d08e9357a96a296111496feb
-SIZE (ode-src-0.9.zip) = 2052825
+MD5 (ode-0.10.1.tar.bz2) = 91c396b915539a760617437d56eb1681
+SHA256 (ode-0.10.1.tar.bz2) = 9636b246ec2d40411babedcb8d2cb5dbc96b4cc65fab7701992b6f7c6a9da72e
+SIZE (ode-0.10.1.tar.bz2) = 1485871
diff --git a/devel/ode/pkg-plist b/devel/ode/pkg-plist
index 29c4b154ae80..d91bf2f7354b 100644
--- a/devel/ode/pkg-plist
+++ b/devel/ode/pkg-plist
@@ -1,23 +1,26 @@
 bin/ode-config
 include/ode/collision.h
 include/ode/collision_space.h
 include/ode/collision_trimesh.h
 include/ode/common.h
 include/ode/compatibility.h
 include/ode/config.h
 include/ode/contact.h
 include/ode/error.h
 include/ode/export-dif.h
 include/ode/mass.h
 include/ode/matrix.h
 include/ode/memory.h
 include/ode/misc.h
 include/ode/objects.h
 include/ode/ode.h
+include/ode/odeconfig.h
 include/ode/odecpp.h
 include/ode/odecpp_collision.h
+include/ode/odeinit.h
 include/ode/odemath.h
 include/ode/rotation.h
 include/ode/timer.h
 lib/libode.a
+lib/libode.la
 @dirrm include/ode