diff --git a/ChangeLog b/ChangeLog
index 0f7dda04d2..b073811569 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-12-4  Cody Russell  <cody@jhu.edu>
+
+	Merge from trunk:
+
+	* modules/engines/ms-windows/Theme/gtk-2.0/gtkrc:
+	Disable beeps when backspacing in textviews by default on
+	Win32 systems. (#490624, Daniel Atallah)
+
 2007-12-4  Cody Russell  <bratsche@gnome.org>
 
 	Merge from trunk:
diff --git a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
index a5406a750c..7e8bc6452c 100755
--- a/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
+++ b/modules/engines/ms-windows/Theme/gtk-2.0/gtkrc
@@ -14,6 +14,9 @@ gtk-alternative-button-order = 1
 # use the win32 sort indicators direction, as in Explorer
 gtk-alternative-sort-arrows = 1
 
+# Windows users don't expect the PC Speaker beeping at them when they backspace in an empty textview and stuff like that
+gtk-error-bell = 0
+
 style "msw-default"
 {
   GtkWidget::interior-focus = 1