diff --git a/x11/e17/edje/Makefile b/x11/e17/edje/Makefile
index c5d3096dfac..709f734a2ea 100644
--- a/x11/e17/edje/Makefile
+++ b/x11/e17/edje/Makefile
@@ -1,30 +1,30 @@
-# $OpenBSD: Makefile,v 1.7 2009/08/11 08:42:07 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.8 2010/01/11 15:02:07 jasper Exp $
 
-COMMENT=	complex graphical design & layout library
-DISTNAME=	edje-20071211
-PKGNAME=	${DISTNAME}p1
+COMMENT =		complex graphical design & layout library
+DISTNAME =		edje-0.9.92.061
+PKGNAME =		${DISTNAME}v0
 
-SHARED_LIBS +=	edje                 0.0      # .5.0
+SHARED_LIBS +=		edje                 0.1 \
+			edje-ver-svn-02      0.1
 
 # BSD
-PERMIT_PACKAGE_CDROM=	Yes
-PERMIT_PACKAGE_FTP=	Yes
-PERMIT_DISTFILES_CDROM= Yes
-PERMIT_DISTFILES_FTP=	Yes
+PERMIT_PACKAGE_CDROM =	Yes
+PERMIT_PACKAGE_FTP =	Yes
+PERMIT_DISTFILES_CDROM =Yes
+PERMIT_DISTFILES_FTP =	Yes
 
 WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
-WANTLIB += Xinerama Xp Xrandr Xrender Xss c eet evas expat fontconfig
-WANTLIB += freetype iconv jpeg m pthread sndio usbhid z pthread-stubs
-WANTLIB += xcb
+WANTLIB += Xinerama Xp Xrandr Xrender Xss Xtst c crypto eet eina
+WANTLIB += evas expat fontconfig freetype jpeg m pthread pthread-stubs
+WANTLIB += ssl xcb z
 
-USE_X11=		Yes
+USE_X11 =		Yes
 
-LIB_DEPENDS=		SDL::devel/sdl \
-			ecore,ecore_evas,ecore_job,ecore_txt,ecore_x::x11/e17/ecore \
+MODULES =		converters/libiconv
+
+USE_LIBTOOL =		Yes
+
+LIB_DEPENDS =		ecore,ecore_imf_evas,ecore_imf,ecore_con,ecore_evas,ecore_file,ecore_input,ecore_job,ecore_txt,ecore_x::x11/e17/ecore \
 			embryo::x11/e17/embryo
 
-CONFIGURE_STYLE=	autoconf automake
-CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/x11/e17/edje/distinfo b/x11/e17/edje/distinfo
index de873d13e79..a3c49755548 100644
--- a/x11/e17/edje/distinfo
+++ b/x11/e17/edje/distinfo
@@ -1,5 +1,5 @@
-MD5 (e17/edje-20071211.tar.gz) = SXiIvCDG0oedDI2JzKAL1Q==
-RMD160 (e17/edje-20071211.tar.gz) = +DX5dLjBLYfab6wThRCusYTYK2I=
-SHA1 (e17/edje-20071211.tar.gz) = /nk7vP2ViW246yE4VPVlva09gi0=
-SHA256 (e17/edje-20071211.tar.gz) = ZNWZxTPk0iJwxGdca/qj1ojyoKKBXvTa4Rpho0BOZMg=
-SIZE (e17/edje-20071211.tar.gz) = 1364066
+MD5 (e17/edje-0.9.92.061.tar.gz) = JTyVCd1IiT8J2oXGHKwgKQ==
+RMD160 (e17/edje-0.9.92.061.tar.gz) = tztMKUD1smQyG3IMtHD2nh6ZwXo=
+SHA1 (e17/edje-0.9.92.061.tar.gz) = pMVsEB4cU36j7qIkjZdJn3uYQR8=
+SHA256 (e17/edje-0.9.92.061.tar.gz) = sdQtAOGxAA+8fe7s9jIZWEQE3/jnWBCFrJbXIqxcciU=
+SIZE (e17/edje-0.9.92.061.tar.gz) = 1738004
diff --git a/x11/e17/edje/patches/patch-src_bin_edje_cc_parse_c b/x11/e17/edje/patches/patch-src_bin_edje_cc_parse_c
new file mode 100644
index 00000000000..cb65cf88a52
--- /dev/null
+++ b/x11/e17/edje/patches/patch-src_bin_edje_cc_parse_c
@@ -0,0 +1,12 @@
+$OpenBSD: patch-src_bin_edje_cc_parse_c,v 1.1 2010/01/11 15:02:07 jasper Exp $
+--- src/bin/edje_cc_parse.c.orig	Thu Jul 23 11:34:05 2009
++++ src/bin/edje_cc_parse.c	Thu Jul 23 11:34:08 2009
+@@ -696,7 +696,7 @@ compile(void)
+ 	 * Redirecting the output is required for MacOS 10.3, and works fine
+ 	 * on other systems.
+ 	 */
+-	snprintf(buf, sizeof(buf), "cat %s | cpp -I%s %s > %s",
++	snprintf(buf, sizeof(buf), "cat %s | cpp -I%s -x c++ %s > %s",
+ 		 file_in, inc, def, tmpn);
+ 	ret = system(buf);
+ 	if (ret < 0)
diff --git a/x11/e17/edje/pkg/PFRAG.shared b/x11/e17/edje/pkg/PFRAG.shared
index 98c937314ab..dbd19a9d8a4 100644
--- a/x11/e17/edje/pkg/PFRAG.shared
+++ b/x11/e17/edje/pkg/PFRAG.shared
@@ -1,2 +1,3 @@
-@comment $OpenBSD: PFRAG.shared,v 1.2 2007/12/16 18:28:59 laurent Exp $
+@comment $OpenBSD: PFRAG.shared,v 1.3 2010/01/11 15:02:07 jasper Exp $
+@lib lib/libedje-ver-svn-02.so.${LIBedje-ver-svn-02_VERSION}
 @lib lib/libedje.so.${LIBedje_VERSION}
diff --git a/x11/e17/edje/pkg/PLIST b/x11/e17/edje/pkg/PLIST
index 02606cba71f..27570a77f85 100644
--- a/x11/e17/edje/pkg/PLIST
+++ b/x11/e17/edje/pkg/PLIST
@@ -1,12 +1,13 @@
-@comment $OpenBSD: PLIST,v 1.2 2007/12/16 18:28:59 laurent Exp $
+@comment $OpenBSD: PLIST,v 1.3 2010/01/11 15:02:07 jasper Exp $
 %%SHARED%%
-bin/edje_cc
-bin/edje_decc
+@bin bin/edje_cc
+@bin bin/edje_decc
 bin/edje_recc
+bin/inkscape2edc
 include/Edje.h
+include/Edje_Edit.h
 lib/libedje.a
 lib/libedje.la
-lib/pkgconfig/
 lib/pkgconfig/edje.pc
 share/edje/
 share/edje/include/