diff --git a/graphics/clutter/Makefile.inc b/graphics/clutter/Makefile.inc
index 5a9f7ba7abd..54a978b23ee 100644
--- a/graphics/clutter/Makefile.inc
+++ b/graphics/clutter/Makefile.inc
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.inc,v 1.7 2011/04/07 12:15:44 jasper Exp $
+# $OpenBSD: Makefile.inc,v 1.8 2011/12/20 14:01:18 ajacoutot Exp $
 
 SHARED_ONLY?=		Yes
 
@@ -13,7 +13,6 @@ PERMIT_DISTFILES_CDROM?=Yes
 PERMIT_DISTFILES_FTP?=  Yes
 
 MASTER_SITES_CLUTTER?=	${HOMEPAGE}/sources/
-MASTER_SITES+=		http://distfiles.nl/clutter/
 DIST_SUBDIR=		clutter
 
 USE_GMAKE?=		Yes
diff --git a/graphics/clutter/cogl/Makefile b/graphics/clutter/cogl/Makefile
index bf1ccf4f946..4d97098ec87 100644
--- a/graphics/clutter/cogl/Makefile
+++ b/graphics/clutter/cogl/Makefile
@@ -1,25 +1,23 @@
-# $OpenBSD: Makefile,v 1.3 2011/10/17 15:49:44 jasper Exp $
+# $OpenBSD: Makefile,v 1.4 2011/12/20 14:01:18 ajacoutot Exp $
 
 COMMENT=		modern 3D graphics API
 
-MAJOR=			1.8
+GNOME_PROJECT=		cogl
+GNOME_VERSION=		1.8.2
 
-DISTNAME=		cogl-${MAJOR}.2
+REVISION=		0
 
 SHARED_LIBS+=		cogl-pango	0.0 # 0.0
 SHARED_LIBS+=		cogl		0.0 # 5.0
 
-MODULES=		x11/gnome \
-			devel/gettext
-
-EXTRACT_SUFX=		.tar.xz
-MASTER_SITES?=		${MASTER_SITE_GNOME:=sources/cogl/${MAJOR}/}
-
 WANTLIB += GL X11 Xau Xcomposite Xdamage Xdmcp Xext Xfixes Xrender
 WANTLIB += Xxf86vm cairo drm expat ffi fontconfig freetype gdk_pixbuf-2.0
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
 WANTLIB += m pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png pthread-stubs xcb xcb-render xcb-shm z stdc++
+WANTLIB += png pthread-stubs stdc++ xcb xcb-render xcb-shm z
+
+MODULES=		x11/gnome \
+			devel/gettext
 
 MODGNOME_TOOLS=		goi