diff --git a/net/librest/Makefile b/net/librest/Makefile
index 94e221f10f6..527cefa8ba4 100644
--- a/net/librest/Makefile
+++ b/net/librest/Makefile
@@ -1,9 +1,9 @@
-# $OpenBSD: Makefile,v 1.7 2011/04/28 13:49:38 jasper Exp $
+# $OpenBSD: Makefile,v 1.8 2011/04/28 13:58:36 ajacoutot Exp $
 
 COMMENT =	access web services that claim to be RESTful
 
-V =		0.7.10
-DISTNAME =	rest-$V
+GNOME_VERSION =	0.7.10
+GNOME_PROJECT =	rest
 PKGNAME =	lib${DISTNAME}
 
 CATEGORIES =	net devel
@@ -13,8 +13,8 @@ SHARED_LIBS +=	rest-extras-0.7 0.0
 
 HOMEPAGE =	http://moblin.org/projects/librest
 
-MAINTAINER=		Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
-			Antoine Jacoutot <ajacoutot@openbsd.org>
+MAINTAINER=	Jasper Lievisse Adriaanse <jasper@openbsd.org>, \
+		Antoine Jacoutot <ajacoutot@openbsd.org>
 
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM =	Yes
@@ -22,22 +22,19 @@ PERMIT_PACKAGE_FTP =	Yes
 PERMIT_DISTFILES_CDROM =Yes
 PERMIT_DISTFILES_FTP =	Yes
 
-MASTER_SITES =		${MASTER_SITE_GNOME:=sources/rest/${V:C/^([0-9]+\.[0-9]+).*/\1/}/}
-EXTRACT_SUFX =		.tar.bz2
-
 WANTLIB += dbus-1 gcrypt gio-2.0 glib-2.0 gmodule-2.0 gnome-keyring
 WANTLIB += gobject-2.0 gpg-error gthread-2.0 m pcre soup-2.4 soup-gnome-2.4
 WANTLIB += sqlite3 xml2 z
 
-MODULES =		devel/gettext
+MODULES =		devel/gettext \
+			x11/gnome
 BUILD_DEPENDS = 	devel/gobject-introspection
 LIB_DEPENDS =		devel/libsoup,-gnome
 
-USE_GMAKE =		Yes
-USE_LIBTOOL =		Yes
 CONFIGURE_STYLE =	gnu
 
-CONFIGURE_ARGS =	--disable-silent-rules \
+CONFIGURE_ARGS =	${CONFIGURE_SHARED} \
+			--disable-gtk-doc \
 			--with-gnome \
 			--enable-introspection