diff --git a/docs/changes.txt b/docs/changes.txt
index c16973f842..56733f93a9 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -55,6 +55,11 @@ wxMSW:
 
 - Fix crash when using wxCHMHelpController() in 64 bit builds (Xlord2).
 
+wxOSX:
+
+- Turn off automatic quotes substitutions in wxTextCtrl (Xlord2).
+
+
 3.1.0: (released 2016-02-29)
 ----------------------------
 
diff --git a/src/osx/cocoa/textctrl.mm b/src/osx/cocoa/textctrl.mm
index 46aa8f3caa..d1a99496c7 100644
--- a/src/osx/cocoa/textctrl.mm
+++ b/src/osx/cocoa/textctrl.mm
@@ -621,6 +621,7 @@ wxNSTextViewControl::wxNSTextViewControl( wxTextCtrl *wxPeer, WXWidget w, long s
     [tv setHorizontallyResizable:hasHScroll];
     [tv setAutoresizingMask:NSViewWidthSizable];
     [tv setAutomaticDashSubstitutionEnabled:false];
+    [tv setAutomaticQuoteSubstitutionEnabled:false];
     
     if ( hasHScroll )
     {