diff --git a/dev-games/ode/ode-0.12.recipe b/dev-games/ode/ode-0.12.recipe
index 06df78601..d23c264ac 100644
--- a/dev-games/ode/ode-0.12.recipe
+++ b/dev-games/ode/ode-0.12.recipe
@@ -1,19 +1,64 @@
-DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics."
+DESCRIPTION="ODE is an open source, high performance library for simulating rigid body dynamics. It is fully featured, stable, mature and platform independent with an easy to use C/C++ API. It has advanced joint types and integrated collision detection with friction. ODE is useful for simulating vehicles, objects in virtual reality environments and virtual creatures."
+SUMMARY="Library for simulating rigid body dynamics"
 HOMEPAGE="http://www.ode.org/"
 SRC_URI="http://downloads.sourceforge.net/project/opende/ODE/0.12/ode-0.12.tar.bz2?r=http%3A%2F%2Fsourceforge.net%2Fprojects%2Fopende%2Ffiles%2F&ts=1356377654&use_mirror=freefr"
+CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
 REVISION="1"
 COPYRIGHT="2001-2004 Russell L. Smith"
-LICENSE="GNU LGPL v3
-	BSD (3-clause)"
-CHECKSUM_MD5="48fdd41fae1a7e7831feeded09826599"
+LICENSE="
+	GNU LGPL v3
+	BSD (3-clause)
+	"
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	ode$secondaryArchSuffix = $portVersion
+	cmd:ode_config = $portVersion
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix >= $haikuVersion
+	"
+	
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	"
+	
+BUILD_PREREQUIRES="
+	cmd:make
+	cmd:mkdepend
+	cmd:gcc$secondaryArchSuffix
+	cmd:ld$secondaryArchSuffix
+	"
+
+SOURCE_DIR="$portVersionedName"
+
+PATCHES="ode-0.12.patch"
+
 BUILD()
 {
-	cd ode-0.12
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
+	runConfigure ./configure --prefix=$prefix
+	make $jobArgs BUILDHOME=`finddir B_SYSTEM_DEVELOP_DIRECTORY`
 }
 INSTALL()
 {
-	cd ode-0.12
 	make install
+	
+	prepareInstalledDevelLib libode
+	fixPkgconfig
+	
+	# devel package
+	packageEntries devel \
+		$developDir
 }
+
+PROVIDES_devel="
+	ode${secondaryArchSuffix}_devel = $portVersion
+	devel:ode$secondaryArchSuffix = $portVersion
+	devel:libode$secondaryArchSuffix = $portVersion
+	"
+	
+REQUIRES_devel="
+	ode$secondaryArchSuffix == $portVersion base
+	"
diff --git a/dev-games/ode/patches/ode-0.12.patch b/dev-games/ode/patches/ode-0.12.patch
index 131dddd87..1e00efd8e 100644
--- a/dev-games/ode/patches/ode-0.12.patch
+++ b/dev-games/ode/patches/ode-0.12.patch
@@ -1,18 +1,6 @@
-diff -u ode-0.12/ode/src/joints/Makefile.in ode-0.12-haiku/ode/src/joints/Makefile.in
---- ode-0.12/ode/src/joints/Makefile.in 2012-05-28 23:26:01.017825792 +0000
-+++ ode-0.12-haiku/ode/src/joints/Makefile.in   2012-12-27 19:39:57.854327296 +0000
-@@ -53,7 +53,7 @@
-        contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \
-        lmotor.lo plane2d.lo pu.lo pr.lo piston.lo
- libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS)
--DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src
-+DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- am__mv = mv -f
-diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h
---- ode-0.12/include/ode/collision.h    2012-12-27 19:39:13.484704256 +0000
-+++ ode-0.12-haiku/include/ode/collision.h      2012-12-27 19:39:01.685244416 +0000
+diff -ur ode-0.12/include/ode/collision.h ode-0.12-patch/include/ode/collision.h
+--- ode-0.12/include/ode/collision.h	2010-11-08 12:00:18.044564480 +0000
++++ ode-0.12-patch/include/ode/collision.h	2013-12-16 16:47:37.561774592 +0000
 @@ -1081,7 +1081,7 @@
  ODE_API void dGeomRaySetClosestHit (dGeomID g, int closestHit);
  ODE_API int dGeomRayGetClosestHit (dGeomID g);
@@ -22,3 +10,15 @@ diff -u ode-0.12/include/ode/collision.h ode-0.12-haiku/include/ode/collision.h
  
  ODE_API dGeomID dCreateGeomTransform (dSpaceID space);
  ODE_API void dGeomTransformSetGeom (dGeomID g, dGeomID obj);
+diff -ur ode-0.12/ode/src/joints/Makefile.in ode-0.12-patch/ode/src/joints/Makefile.in
+--- ode-0.12/ode/src/joints/Makefile.in	2012-05-28 23:26:01.004980736 +0000
++++ ode-0.12-patch/ode/src/joints/Makefile.in	2013-12-16 16:35:09.259784704 +0000
+@@ -53,7 +53,7 @@
+ 	contact.lo universal.lo hinge2.lo fixed.lo null.lo amotor.lo \
+ 	lmotor.lo plane2d.lo pu.lo pr.lo piston.lo
+ libjoints_la_OBJECTS = $(am_libjoints_la_OBJECTS)
+-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/ode/src
++DEFAULT_INCLUDES = -I.@am__isrc@ -I- -I$(top_builddir)/ode/src
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f