diff --git a/Lib/tkinter/Tkinter.py b/Lib/tkinter/Tkinter.py
index 286a557..9fb1d02 100755
--- a/Lib/tkinter/Tkinter.py
+++ b/Lib/tkinter/Tkinter.py
@@ -1219,7 +1219,10 @@
 	def __init__(self, master=None, cnf={}, **kw):
 		cnf = _cnfmerge((cnf, kw))
 		extra = ()
-		if cnf.has_key('class'):
+		if cnf.has_key('class_'):
+			extra = ('-class', cnf['class_'])
+			del cnf['class_']
+		elif cnf.has_key('class'):
 			extra = ('-class', cnf['class'])
 			del cnf['class']
 		Widget.__init__(self, master, 'frame', cnf, {}, extra)