diff --git a/ChangeLog b/ChangeLog
index 38e13bce1..3e86b98df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-16  Joe Shaw  <joe@ximian.com>
+
+	* generator/SymbolTable.cs (MangleName): Add "lock" and "callback"
+	to the list of names that need to be mangled.  The former is a C#
+	reserved keyword and the latter is already used as an argument to
+	methods which marshal callbacks.
+
 2003-12-15  Mike Kestner  <mkestner@ximian.com>
 
 	* generator/BoxedGen.cs : s/uint/GLib.GType
diff --git a/generator/SymbolTable.cs b/generator/SymbolTable.cs
index a03df3ee8..a0e8d4cb7 100644
--- a/generator/SymbolTable.cs
+++ b/generator/SymbolTable.cs
@@ -318,6 +318,10 @@ namespace GtkSharp.Generation {
 				return "_new";
 			case "base":
 				return "_base";
+			case "lock":
+				return "_lock";
+			case "callback":
+				return "cb";
 			default:
 				break;
 			}