diff --git a/ChangeLog b/ChangeLog
index 2c52cd0f3..19f408002 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-25  Mike Kestner  <mkestner@novell.com>
+
+	* generator/CallbackGen.cs : add CDeclCallback attrs to native dels.
+	* generator/Signal.cs : add CDeclCallback attrs to native dels.
+
 2005-03-25  Mike Kestner  <mkestner@novell.com>
 
 	* */*.cs : tag native callback delegates with [CDeclCallback].
diff --git a/generator/CallbackGen.cs b/generator/CallbackGen.cs
index 8413761c2..7d134082d 100644
--- a/generator/CallbackGen.cs
+++ b/generator/CallbackGen.cs
@@ -69,6 +69,7 @@ namespace GtkSharp.Generation {
 			sw.WriteLine ("\tusing System;");
 			sw.WriteLine ();
 			sw.WriteLine ("#region Autogenerated code");
+			sw.WriteLine ("\t[GLib.CDeclCallback]");
 			sw.WriteLine ("\tinternal delegate " + retval.MarshalType + " " + wrapper + "(" + isig + ");");
 			sw.WriteLine ();
 			sw.WriteLine ("\tinternal class " + Name + "Wrapper {");
diff --git a/generator/Signal.cs b/generator/Signal.cs
index 183ffbc05..2ee573be7 100644
--- a/generator/Signal.cs
+++ b/generator/Signal.cs
@@ -192,6 +192,7 @@ namespace GtkSharp.Generation {
 		{
 			SymbolTable table = SymbolTable.Table;
 
+			sw.WriteLine ("\t\t[GLib.CDeclCallback]");
 			sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ");");
 			sw.WriteLine ();
 			sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ")");
@@ -321,6 +322,7 @@ namespace GtkSharp.Generation {
 		{
 			ImportSignature isig = new ImportSignature (parms, container_type.NS);
 			ManagedCallString call = new ManagedCallString (parms);
+			sw.WriteLine ("\t\t[GLib.CDeclCallback]");
 			sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + isig.ToString () + ");\n");
 			sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "VMDelegate", Name + "VMCallback");
 			sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + isig.ToString () + ")");