diff --git a/ChangeLog b/ChangeLog
index cf7ba87fb..13089f403 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-10-25  Eric Wasylishen  <ewasylishen@gmail.com>
+
+	* Source/GSThemeDrawing.m: Draw a question mark centered in the bezel
+	for NSHelpButtonBezelStyle
+
 2011-10-25  Eric Wasylishen  <ewasylishen@gmail.com>
 
 	* Source/NSBitmapImageRep.m:
diff --git a/Source/GSThemeDrawing.m b/Source/GSThemeDrawing.m
index 682105685..6c5234e5c 100644
--- a/Source/GSThemeDrawing.m
+++ b/Source/GSThemeDrawing.m
@@ -153,9 +153,25 @@
 	    break;
 	  case NSCircularBezelStyle:
 	    frame = NSInsetRect(frame, 3, 3);
-	  case NSHelpButtonBezelStyle:
 	    [self drawCircularBezel: frame withColor: color]; 
 	    break;
+	  case NSHelpButtonBezelStyle:
+	    [self drawCircularBezel: frame withColor: color];
+	    {
+	      NSDictionary *attributes = [NSDictionary dictionaryWithObject: [NSFont controlContentFontOfSize: 0]
+								     forKey: NSFontAttributeName];
+	      NSAttributedString *questionMark = [[[NSAttributedString alloc]
+						    initWithString: _(@"?")
+							attributes: attributes] autorelease];
+
+	      NSRect textRect;
+	      textRect.size = [questionMark size];
+	      textRect.origin.x = NSMidX(frame) - (textRect.size.width / 2);
+	      textRect.origin.y = NSMidY(frame) - (textRect.size.height / 2);
+
+	      [questionMark drawInRect: textRect];
+	    }
+	    break;
 	  case NSDisclosureBezelStyle:
 	  case NSRoundedDisclosureBezelStyle:
 	  case NSRecessedBezelStyle: