diff --git a/CHANGES.current b/CHANGES.current
index b294f9664..a1e7ed6e2 100644
--- a/CHANGES.current
+++ b/CHANGES.current
@@ -1,6 +1,11 @@
 Version 2.0.0 (in progress)
 ============================
 
+2010-05-26: olly
+	    Fix %attribute2ref not to produce a syntax error if the last
+	    argument (AccessorMethod) is omitted.  Patch from David Piepgras
+	    in SF#2235756.
+
 2010-05-26: olly
 	    [PHP] When using %throws or %catches, SWIG-generated PHP5 wrappers
 	    now throw PHP Exception objects instead of giving a PHP error of
diff --git a/Lib/typemaps/attribute.swg b/Lib/typemaps/attribute.swg
index 4dcf15e2d..214133edc 100644
--- a/Lib/typemaps/attribute.swg
+++ b/Lib/typemaps/attribute.swg
@@ -221,7 +221,7 @@
   #if #AccessorMethod != ""
     %attribute_custom(Class, AttributeType, AttributeName, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
   #else
-    %attribute_custom(Class, AttributeType, AccessorMethod, AccessorMethod, AccessorMethod, &self_->AccessorMethod(), self_->AccessorMethod() = *val_)
+    %attribute_custom(Class, AttributeType, AccessorName, AccessorName, AccessorName, &self_->AccessorName(), self_->AccessorName() = *val_)
   #endif
 %enddef