Index: Objects/funcobject.c
===================================================================
--- Objects/funcobject.c	(revision 72757)
+++ Objects/funcobject.c	(working copy)
@@ -700,8 +700,8 @@
 
      class C:
          def f(cls, arg1, arg2, ...): ...
-	 f = classmethod(f)
-   
+         f = classmethod(f)
+
    It can be called either on the class (e.g. C.f()) or on an instance
    (e.g. C().f()); the instance is ignored except for its class.
    If a class method is called for a derived class, the derived class
@@ -775,6 +775,11 @@
 	return 0;
 }
 
+static PyMemberDef cm_memberlist[] = {
+	{"__func__", T_OBJECT, offsetof(classmethod, cm_callable), READONLY},
+	{NULL}  /* Sentinel */
+};
+
 PyDoc_STRVAR(classmethod_doc,
 "classmethod(function) -> method\n\
 \n\
@@ -825,7 +830,7 @@
 	0,					/* tp_iter */
 	0,					/* tp_iternext */
 	0,					/* tp_methods */
-	0,					/* tp_members */
+	cm_memberlist,		/* tp_members */
 	0,					/* tp_getset */
 	0,					/* tp_base */
 	0,					/* tp_dict */
@@ -925,6 +930,11 @@
 	return 0;
 }
 
+static PyMemberDef sm_memberlist[] = {
+	{"__func__", T_OBJECT, offsetof(staticmethod, sm_callable), READONLY},
+	{NULL}  /* Sentinel */
+};
+
 PyDoc_STRVAR(staticmethod_doc,
 "staticmethod(function) -> method\n\
 \n\
@@ -935,7 +945,7 @@
 \n\
      class C:\n\
          def f(arg1, arg2, ...): ...\n\
-	 f = staticmethod(f)\n\
+         f = staticmethod(f)\n\
 \n\
 It can be called either on the class (e.g. C.f()) or on an instance\n\
 (e.g. C().f()).  The instance is ignored except for its class.\n\
@@ -972,7 +982,7 @@
 	0,					/* tp_iter */
 	0,					/* tp_iternext */
 	0,					/* tp_methods */
-	0,					/* tp_members */
+	sm_memberlist,		/* tp_members */
 	0,					/* tp_getset */
 	0,					/* tp_base */
 	0,					/* tp_dict */
Index: Lib/test/test_funcattrs.py
===================================================================
--- Lib/test/test_funcattrs.py	(revision 72757)
+++ Lib/test/test_funcattrs.py	(working copy)
@@ -254,11 +254,23 @@
         self.assert_(cell(-36) == cell(-36.0))
         self.assert_(cell(True) > empty_cell())
 
+class StaticMethodAttrsTest(unittest.TestCase):
+    def test_func_attribute(self):
+        def f():
+            pass
 
+        c = classmethod(f)
+        self.assert_(c.__func__ is f)
+
+        s = staticmethod(f)
+        self.assert_(s.__func__ is f)
+
+
 def test_main():
     support.run_unittest(FunctionPropertiesTest, ImplicitReferencesTest,
-                              ArbitraryFunctionAttrTest, FunctionDictsTest,
-                              FunctionDocstringTest, CellTest)
+                         ArbitraryFunctionAttrTest, FunctionDictsTest,
+                         FunctionDocstringTest, CellTest,
+                         StaticMethodAttrsTest)
 
 if __name__ == "__main__":
     test_main()