diff --git a/textproc/gtkaml/Makefile b/textproc/gtkaml/Makefile
index c405cbe8d16..cd78fd34d1b 100644
--- a/textproc/gtkaml/Makefile
+++ b/textproc/gtkaml/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.4 2008/06/29 22:05:24 jasper Exp $
+# $OpenBSD: Makefile,v 1.5 2008/10/26 17:24:46 jasper Exp $
 
 COMMENT=		application markup language for GTK+Vala
 
-DISTNAME=		gtkaml-0.2.1.1
+DISTNAME=		gtkaml-0.2.2.0
 CATEGORIES=		textproc
 
 HOMEPAGE=		http://gtkaml.googlecode.com/
diff --git a/textproc/gtkaml/distinfo b/textproc/gtkaml/distinfo
index 5d7ede30904..123e71cf53b 100644
--- a/textproc/gtkaml/distinfo
+++ b/textproc/gtkaml/distinfo
@@ -1,5 +1,5 @@
-MD5 (gtkaml-0.2.1.1.tar.bz2) = ZrC8/Kp5NFcsKXmXBceehA==
-RMD160 (gtkaml-0.2.1.1.tar.bz2) = +6qUSx0lJjxtyg6ipoCj0yN3pjQ=
-SHA1 (gtkaml-0.2.1.1.tar.bz2) = 1iH7IAJCUxzeVpRCJxCcc35kIwM=
-SHA256 (gtkaml-0.2.1.1.tar.bz2) = SZsuFY9SS/YnffEIALHI0vboRMxoU7qf4DSyMmJk7uc=
-SIZE (gtkaml-0.2.1.1.tar.bz2) = 135514
+MD5 (gtkaml-0.2.2.0.tar.bz2) = 5knPAtaC9nlnJdu9RGGtDw==
+RMD160 (gtkaml-0.2.2.0.tar.bz2) = HlCbkuIGqFKVYCt31unBMAMGjoI=
+SHA1 (gtkaml-0.2.2.0.tar.bz2) = pq4Jg/5YKJXl4uwvIfS9++vUsgc=
+SHA256 (gtkaml-0.2.2.0.tar.bz2) = Qh/Nj7YbNK8cjHRNvV5ywnCRGJh6RNpO4kROhq1jKlc=
+SIZE (gtkaml-0.2.2.0.tar.bz2) = 137221
diff --git a/textproc/gtkaml/patches/patch-data_Gtk_implicits b/textproc/gtkaml/patches/patch-data_Gtk_implicits
new file mode 100644
index 00000000000..7f205e193d1
--- /dev/null
+++ b/textproc/gtkaml/patches/patch-data_Gtk_implicits
@@ -0,0 +1,15 @@
+$OpenBSD: patch-data_Gtk_implicits,v 1.1 2008/10/26 17:24:46 jasper Exp $
+
+Fix build, from upstream, -r352.
+
+--- data/Gtk.implicits.orig	Sun Oct 26 17:56:10 2008
++++ data/Gtk.implicits	Sun Oct 26 17:56:22 2008
+@@ -96,7 +96,7 @@ adds = insert
+ adds = append_column;remove_column;insert_column
+ 
+ [TreeViewColumn]
+-adds = pack_start;pack_end;add_attribute;
++adds = pack_start;pack_end;add_attribute
+ 
+ [Dialog]
+ adds = add_action_widget
diff --git a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c b/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c
index 9db6f32391d..7e3d16415b7 100644
--- a/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c
+++ b/textproc/gtkaml/patches/patch-src_GtkamlImplicitsStore_c
@@ -1,6 +1,6 @@
-$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.2 2008/06/29 22:05:24 jasper Exp $
---- src/GtkamlImplicitsStore.c.orig	Sun Jun 29 23:58:07 2008
-+++ src/GtkamlImplicitsStore.c	Mon Jun 30 00:03:26 2008
+$OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.3 2008/10/26 17:24:46 jasper Exp $
+--- src/GtkamlImplicitsStore.c.orig	Sun Aug 17 11:23:32 2008
++++ src/GtkamlImplicitsStore.c	Sun Oct 26 17:09:37 2008
 @@ -67,7 +67,7 @@ enum  {
  	GTKAML_KEY_FILE_WRAPPER_DUMMY_PROPERTY
  };
@@ -10,7 +10,7 @@ $OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.2 2008/06/29 22:05:24 jasper Exp
  static GtkamlKeyFileWrapper* gtkaml_key_file_wrapper_new (void);
  static GObject * gtkaml_key_file_wrapper_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
  static gpointer gtkaml_key_file_wrapper_parent_class = NULL;
-@@ -150,14 +150,14 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
+@@ -151,14 +151,14 @@ static gboolean gtkaml_key_file_wrapper_has_key (Gtkam
  }
  
  
@@ -27,7 +27,7 @@ $OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.2 2008/06/29 22:05:24 jasper Exp
  		char** _tmp1;
  		_tmp1 = NULL;
  		return (_tmp1 = g_key_file_get_string_list (self->key_file, group, key, &_tmp0, &inner_error), (*result_length1) = _tmp0, _tmp1);
-@@ -331,15 +331,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic
+@@ -335,15 +335,15 @@ GeeList* gtkaml_implicits_store_get_adds (GtkamlImplic
  			{
  				if (gtkaml_key_file_wrapper_has_key (kfw, class_name, "adds")) {
  					char** _tmp1;
@@ -46,7 +46,7 @@ $OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.2 2008/06/29 22:05:24 jasper Exp
  						add_collection = kf_adds;
  						add_collection_length1 = kf_adds_length1;
  						for (add_it = 0; (kf_adds_length1 != -1 && add_it < kf_adds_length1) || (kf_adds_length1 == -1 && add_collection[add_it] != NULL); add_it = add_it + 1) {
-@@ -382,8 +382,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters 
+@@ -386,8 +386,8 @@ GeeList* gtkaml_implicits_store_get_method_parameters 
  			{
  				if (gtkaml_key_file_wrapper_has_key (kfw, class_name, method_name)) {
  					char** _tmp1;
@@ -57,7 +57,7 @@ $OpenBSD: patch-src_GtkamlImplicitsStore_c,v 1.2 2008/06/29 22:05:24 jasper Exp
  					char** kf_parameters;
  					GeeList* _tmp8;
  					_tmp1 = NULL;
-@@ -391,7 +391,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters 
+@@ -395,7 +395,7 @@ GeeList* gtkaml_implicits_store_get_method_parameters 
  					{
  						char** parameter_collection;
  						int parameter_collection_length1;