diff --git a/ChangeLog b/ChangeLog
index 7cfb71141..74b7d4f6f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-11  Mike Kestner  <mkestner@novell.com>
+
+	* generator/ObjectGen.cs : default empty assembly names for the
+	mapper.  [Fixes #74769]
+
 2005-05-10  Mike Kestner  <mkestner@novell.com>
 
 	* gtk/Object.custom : Dispose on a Destroyed event.
diff --git a/generator/ObjectGen.cs b/generator/ObjectGen.cs
index b8c1e83ea..7cb273ff5 100644
--- a/generator/ObjectGen.cs
+++ b/generator/ObjectGen.cs
@@ -118,7 +118,8 @@ namespace GtkSharp.Generation {
 		{
 			gen_info.CurrentType = Name;
 
-			DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, gen_info.AssemblyName);
+			string asm_name = gen_info.AssemblyName.Length == 0 ? NS.ToLower () + "-sharp" : gen_info.AssemblyName;
+			DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, asm_name);
 
 			StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
 
@@ -214,7 +215,7 @@ namespace GtkSharp.Generation {
 				sw.WriteLine ();
 				sw.WriteLine ("\t\tstatic " + Name + " ()");
 				sw.WriteLine ("\t\t{");
-				sw.WriteLine ("\t\t\tGtkSharp." + Studlify (gen_info.AssemblyName) + ".ObjectManager.Initialize ();");
+				sw.WriteLine ("\t\t\tGtkSharp." + Studlify (asm_name) + ".ObjectManager.Initialize ();");
 				sw.WriteLine ("\t\t}");
 			}