diff --git a/dev-libs/atk/atk-1.29.2.recipe b/dev-libs/atk/atk-1.29.2.recipe
deleted file mode 100644
index 69fd745cc..000000000
--- a/dev-libs/atk/atk-1.29.2.recipe
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION="atk - GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/atk/1.29/atk-1.29.2.tar.gz"
-CHECKSUM_MD5="bc35c5d6e1b8e69303944aae2fe516ed"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="sys-devel/gettext >= 0.17
-	dev-libs/glib >= 2.24.0"
-BUILD()
-{
-	cd atk-1.29.2
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd atk-1.29.2
-	make isntall
-}
diff --git a/dev-libs/atk/atk-1.30.0.recipe b/dev-libs/atk/atk-1.30.0.recipe
deleted file mode 100644
index 9ed576814..000000000
--- a/dev-libs/atk/atk-1.30.0.recipe
+++ /dev/null
@@ -1,28 +0,0 @@
-DESCRIPTION="atk - GTK+ & GNOME Accessibility Toolkit"
-HOMEPAGE="http://developer.gnome.org/projects/gap/"
-SOURCE_URI="http://ftp.gnome.org/pub/GNOME/sources/atk/1.30/atk-1.30.0.tar.gz"
-CHECKSUM_MD5="d546d814b3ddfd10659545fb3c1168fc"
-REVISION="1"
-STATUS_HAIKU="broken"
-DEPEND="sys-devel/gettext >= 0.17
-	dev-libs/glib >= 2.24.0
-	dev-util/gtk-doc >= 1.15"
-BUILD()
-{
-	cd atk-1.30.0
-	libtoolize --force --copy --install
-	aclocal
-	autoconf
-	automake
-	./configure --prefix=`finddir B_COMMON_DIRECTORY`
-	make
-}
-
-INSTALL()
-{
-	cd atk-1.30.0
-	make isntall
-}
-
-#LICENSE=""
-#COPYRIGHT=""
diff --git a/dev-libs/atk/atk-2.23.4.recipe b/dev-libs/atk/atk-2.23.4.recipe
new file mode 100644
index 000000000..d36cbc8bb
--- /dev/null
+++ b/dev-libs/atk/atk-2.23.4.recipe
@@ -0,0 +1,89 @@
+SUMMARY="GTK+ & GNOME Accessibility Toolkit"
+DESCRIPTION="Provides the set of accessibility interface that are implemented \
+by other toolkits and applications.  Using the ATK interfaces, accessibility \
+tools have full access to view and control running applications."
+HOMEPAGE="https://developer.gnome.org/atk/"
+COPYRIGHT="2001-2003, 2006-2007 Sun Microsystems Inc.
+	2009 Novell, Inc.
+	2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+	2012-2014 ATK Team
+	2014 SUSE LLC."
+LICENSE="GNU LGPL v2"
+REVISION="1"
+SOURCE_URI="https://ftp.gnome.org/pub/GNOME/sources/atk/2.23/atk-2.23.4.tar.xz"
+CHECKSUM_SHA256="6888f4e902fc4727b1687ff512d5d087050f4c0d11035566484988cf698c2c1a"
+PATCHES="atk-$portVersion.patch"
+
+ARCHITECTURES="x86_gcc2 ?x86 ?x86_64"
+SECONDARY_ARCHITECTURES="x86_gcc2 ?x86"
+
+PROVIDES="
+	atk$secondaryArchSuffix = $portVersion
+	lib:libatk_1.0 = 0.22313.1 compat >= 0
+	"
+
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libglib_2.0$secondaryArchSuffix
+	lib:libgobject_2.0$secondaryArchSuffix
+	lib:gtk_doc$secondaryArchSuffix
+	lib:libintl$secondaryArchSuffix
+	cmd:gettext$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	atk${secondaryArchSuffix}_devel = $portVersion
+	devel:libatk_1.0 = 0.22313.1 compat >= 0
+	"
+REQUIRES_devel="
+	haiku${secondaryArchSuffix}_devel
+	atk$secondaryArchSuffix == $portVersion base
+	"
+
+BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel
+	devel:libglib_2.0$secondaryArchSuffix
+	"
+
+BUILD_PREREQUIRES="
+	cmd:autoconf
+	cmd:awk
+	cmd:gcc$secondaryArchSuffix
+	cmd:libtoolize$secondaryArchSuffix
+	cmd:make
+	cmd:pkg_config$secondaryArchSuffix
+	"
+
+BUILD()
+{
+	runConfigure ./configure
+	make
+}
+
+INSTALL()
+{
+	make install
+
+	rm $libDir/libatk-1.0.la
+
+	prepareInstalledDevelLib libatk-1.0
+	fixPkgconfig
+
+	if [ -n "$secondaryArchSuffix" ]; then
+		rm -rf $dataDir/gtk-doc
+	fi
+
+	packageEntries devel \
+		$developDir
+}
+
+TEST()
+{
+	make check
+	cd tests
+	./teststateset
+	./testrelation
+	./testrole
+	./testvalue
+	./testdocument
+}
diff --git a/dev-libs/atk/patches/atk-2.23.4.patch b/dev-libs/atk/patches/atk-2.23.4.patch
new file mode 100644
index 000000000..9df8c5cb0
--- /dev/null
+++ b/dev-libs/atk/patches/atk-2.23.4.patch
@@ -0,0 +1,55 @@
+diff --git a/tests/testvalue.c b/tests/testvalue.c
+index 7ec0a29..490999d 100644
+--- a/tests/testvalue.c
++++ b/tests/testvalue.c
+@@ -119,9 +119,10 @@ test_value_get_value_and_text (AtkValue *value,
+                                gdouble *current_value,
+                                gchar **description)
+ {
++  TestValue *self;
+   g_return_if_fail (TEST_IS_VALUE (value));
+ 
+-  TestValue *self = TEST_VALUE (value);
++  self = TEST_VALUE (value);
+ 
+   if (current_value != NULL)
+     *current_value = self->value;
+@@ -133,9 +134,10 @@ test_value_get_value_and_text (AtkValue *value,
+ AtkRange*
+ test_value_get_range (AtkValue *value)
+ {
++  AtkRange *result;
+   g_return_val_if_fail (TEST_IS_VALUE (value), NULL);
+ 
+-  AtkRange *result = atk_range_new (LOWER_LIMIT,
++  result = atk_range_new (LOWER_LIMIT,
+                                     UPPER_LIMIT,
+                                     NULL);
+ 
+@@ -153,10 +155,12 @@ test_value_get_increment (AtkValue *value)
+ GSList*
+ test_value_get_sub_ranges (AtkValue *value)
+ {
++  GSList *result;
++  AtkRange *range;
+   g_return_val_if_fail (TEST_IS_VALUE (value), NULL);
+ 
+-  GSList *result = NULL;
+-  AtkRange *range = NULL;
++  result = NULL;
++  range = NULL;
+ 
+   /* low */
+   range = atk_range_new (LOWER_LIMIT, LOW_THRESHOLD,
+@@ -186,9 +190,10 @@ void
+ test_value_set_value (AtkValue *value,
+                       double new_value)
+ {
++  TestValue *self;
+   g_return_if_fail (TEST_IS_VALUE (value));
+ 
+-  TestValue *self = TEST_VALUE (value);
++  self = TEST_VALUE (value);
+ 
+   if (new_value < LOWER_LIMIT)
+     new_value = LOWER_LIMIT;