diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index a8ae502609b..e36c5307875 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,15 +1,13 @@
-# $OpenBSD: Makefile,v 1.19 2007/02/23 22:35:35 espie Exp $
+# $OpenBSD: Makefile,v 1.20 2007/04/23 16:22:46 jasper Exp $
 
 COMMENT=		"accessibility toolkit used by gtk+"
 
-DISTNAME=		atk-1.10.3
-PKGNAME=		${DISTNAME}p2
-SHARED_LIBS +=	atk-1.0              1011.3   # .1010.3
+DISTNAME=		atk-1.18.0
+SHARED_LIBS +=	atk-1.0              1809.1   # .1809.1
 
 CATEGORIES=		devel
 
 HOMEPAGE=		http://www.gtk.org
-MAINTAINER=		Marc Matteo <marcm@openbsd.org>
 
 # LGPL
 PERMIT_PACKAGE_CDROM=	Yes
@@ -17,16 +15,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/1.10/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/1.18/}
 EXTRACT_SUFX=           .tar.bz2
 
 MODULES=		devel/gettext
-LIB_DEPENDS=		glib-2.0.>=600.0,gmodule-2.0.>=600.0,gobject-2.0.>=600.0::devel/glib2
+LIB_DEPENDS=		glib-2.0.>=1200.0,gmodule-2.0.>=1200.0,gobject-2.0.>=1200.0::devel/glib2
 
 USE_GMAKE=		Yes
 USE_LIBTOOL=		Yes
 CONFIGURE_STYLE=	gnu
 CONFIGURE_ARGS+=	${CONFIGURE_SHARED}
-CONFIGURE_ARGS+=	--enable-static
 
 .include <bsd.port.mk>
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index 71945691fab..cde46fa4b1c 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1,5 +1,5 @@
-MD5 (atk-1.10.3.tar.bz2) = yEoB/qVns2XA1Esif+rZSA==
-RMD160 (atk-1.10.3.tar.bz2) = 3KtpJ8owYyI7bUV1+noTN7r5AA8=
-SHA1 (atk-1.10.3.tar.bz2) = dNg4gt7C6b2SM9Eq6NuXBk58P74=
-SHA256 (atk-1.10.3.tar.bz2) = xZa6+V9qbNd0ixAYM2sqxFyi72aIFubHA7AWkeCbiok=
-SIZE (atk-1.10.3.tar.bz2) = 542712
+MD5 (atk-1.18.0.tar.bz2) = n8M+xI/TKTP39jBHnfrWZw==
+RMD160 (atk-1.18.0.tar.bz2) = w2jBmwx7V3tsUq6wMlxJIGU5IOo=
+SHA1 (atk-1.18.0.tar.bz2) = 1Y38Pb2tSdjERuC9SgtiYNMVzrA=
+SHA256 (atk-1.18.0.tar.bz2) = vi1TdkKkO1oehaLQ+BMWe4WFeB/4MgOk9oIGw+zWoxU=
+SIZE (atk-1.18.0.tar.bz2) = 655890
diff --git a/devel/atk/pkg/PLIST b/devel/atk/pkg/PLIST
index 6de46c9e90b..655df778fef 100644
--- a/devel/atk/pkg/PLIST
+++ b/devel/atk/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.8 2005/09/06 04:06:36 marcm Exp $
+@comment $OpenBSD: PLIST,v 1.9 2007/04/23 16:22:46 jasper Exp $
 %%SHARED%%
 include/atk-1.0/
 include/atk-1.0/atk/
@@ -10,8 +10,10 @@ include/atk-1.0/atk/atkdocument.h
 include/atk-1.0/atk/atkeditabletext.h
 include/atk-1.0/atk/atkgobjectaccessible.h
 include/atk-1.0/atk/atkhyperlink.h
+include/atk-1.0/atk/atkhyperlinkimpl.h
 include/atk-1.0/atk/atkhypertext.h
 include/atk-1.0/atk/atkimage.h
+include/atk-1.0/atk/atkmisc.h
 include/atk-1.0/atk/atknoopobject.h
 include/atk-1.0/atk/atknoopobjectfactory.h
 include/atk-1.0/atk/atkobject.h
@@ -35,7 +37,44 @@ lib/pkgconfig/atk.pc
 @comment share/gtk-doc/
 @comment share/gtk-doc/html/
 @comment share/gtk-doc/html/atk/
+share/gtk-doc/html/atk/AtkAction.html
+share/gtk-doc/html/atk/AtkComponent.html
+share/gtk-doc/html/atk/AtkDocument.html
+share/gtk-doc/html/atk/AtkEditableText.html
+share/gtk-doc/html/atk/AtkGObjectAccessible.html
+share/gtk-doc/html/atk/AtkHyperlink.html
+share/gtk-doc/html/atk/AtkHypertext.html
+share/gtk-doc/html/atk/AtkImage.html
+share/gtk-doc/html/atk/AtkNoOpObject.html
+share/gtk-doc/html/atk/AtkNoOpObjectFactory.html
+share/gtk-doc/html/atk/AtkObject.html
+share/gtk-doc/html/atk/AtkObjectFactory.html
+share/gtk-doc/html/atk/AtkRegistry.html
+share/gtk-doc/html/atk/AtkRelation.html
+share/gtk-doc/html/atk/AtkRelationSet.html
+share/gtk-doc/html/atk/AtkSelection.html
+share/gtk-doc/html/atk/AtkStreamableContent.html
+share/gtk-doc/html/atk/AtkTable.html
+share/gtk-doc/html/atk/AtkText.html
+share/gtk-doc/html/atk/AtkUtil.html
+share/gtk-doc/html/atk/AtkValue.html
+share/gtk-doc/html/atk/atk-AtkHyperlinkImpl.html
+share/gtk-doc/html/atk/atk-AtkState.html
+share/gtk-doc/html/atk/atk-AtkStateSet.html
+share/gtk-doc/html/atk/atk.devhelp
+share/gtk-doc/html/atk/atk.devhelp2
+share/gtk-doc/html/atk/atk.html
 @comment share/gtk-doc/html/atk/home.png
+share/gtk-doc/html/atk/index.html
+share/gtk-doc/html/atk/index.sgml
+share/gtk-doc/html/atk/ix01.html
+share/gtk-doc/html/atk/ix02.html
+share/gtk-doc/html/atk/ix03.html
+share/gtk-doc/html/atk/ix04.html
+share/gtk-doc/html/atk/ix05.html
+share/gtk-doc/html/atk/ix06.html
+share/gtk-doc/html/atk/ix07.html
 @comment share/gtk-doc/html/atk/left.png
 @comment share/gtk-doc/html/atk/right.png
+share/gtk-doc/html/atk/style.css
 @comment share/gtk-doc/html/atk/up.png