diff --git a/ChangeLog b/ChangeLog
index 60cc34b59..af7d4c241 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-06-17  Mike Kestner  <mkestner@novell.com>
+
+	* Makefile.include : add included apis as deps on the generation
+	target to force regen if dependency lib api changes.
+	* pango/Analysis.custom : new custom to implement the ExtraAttrs
+	property.  [Fixes #74668]
+	* pango/Makefile.am : add new custom file.
+
 2005-06-17  Mike Kestner  <mkestner@novell.com>
 
 	* bootstrap : use assembly version 2.6.0.0.
diff --git a/Makefile.include b/Makefile.include
index a5b6055db..ac08da8df 100644
--- a/Makefile.include
+++ b/Makefile.include
@@ -28,7 +28,7 @@ $(API): $(METADATA) $(RAW_API) $(SYMBOLS) $(top_builddir)/parser/gapi-fixup.exe
 build_customs = $(addprefix $(srcdir)/, $(customs))
 api_includes = $(addprefix -I:, $(INCLUDE_API))
 
-generated-stamp: $(API) $(top_builddir)/generator/gapi_codegen.exe $(build_customs)
+generated-stamp: $(API) $(INCLUDE_API) $(top_builddir)/generator/gapi_codegen.exe $(build_customs)
 	rm -f generated/* &&	\
 	$(RUNTIME) $(top_builddir)/generator/gapi_codegen.exe --generate $(API) \
 	$(api_includes)	\
diff --git a/pango/Analysis.custom b/pango/Analysis.custom
new file mode 100644
index 000000000..324111b59
--- /dev/null
+++ b/pango/Analysis.custom
@@ -0,0 +1,32 @@
+// Pango.Analysis.custom - Pango Analysis class customizations
+//
+// Authors:  Mike Kestner  <mkestner@novell.com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This code is inserted after the automatically generated code.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General 
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+		public Attribute[] ExtraAttrs {
+			get {
+				GLib.SList list = new GLib.SList (_extra_attrs, typeof (IntPtr));
+				Attribute[] result = new Attribute [list.Count];
+				int i = 0;
+				foreach (IntPtr attr in list)
+					result [i++] = Attribute.GetAttribute (attr);
+				return result;
+			}
+		}
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 6392e5896..4c45179c2 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -31,6 +31,7 @@ sources =			\
 	Units.cs
 
 customs =			\
+	Analysis.custom		\
 	AttrIterator.custom	\
 	Context.custom		\
 	Coverage.custom		\