diff --git a/ChangeLog b/ChangeLog
index 584e02f2..dd775b35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
  * src/editor.c:
    Properly fix wrong brace highlighting of non-brace character.
+ * src/editor.c:
+   Allow autocompletion in Perl double-quoted strings.
+   Don't autocomplete in Perl single-quoted strings (closes #2821061).
+   Don't autocomplete in Perl q() strings.
 
 
 2009-07-13  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/src/editor.c b/src/editor.c
index a7faa904..9d4a7534 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -3248,12 +3248,18 @@ static gboolean is_string_style(gint lexer, gint style)
 				style == SCE_F_STRINGEOL);
 
 		case SCLEX_PERL:
-			return (style == SCE_PL_STRING ||
+			return (/*style == SCE_PL_STRING ||*/ /* may want variable autocompletion "$(foo)" */
+				style == SCE_PL_CHARACTER ||
 				style == SCE_PL_HERE_DELIM ||
 				style == SCE_PL_HERE_Q ||
 				style == SCE_PL_HERE_QQ ||
 				style == SCE_PL_HERE_QX ||
 				style == SCE_PL_POD ||
+				style == SCE_PL_STRING_Q ||
+				style == SCE_PL_STRING_QQ ||
+				style == SCE_PL_STRING_QX ||
+				style == SCE_PL_STRING_QR ||
+				style == SCE_PL_STRING_QW ||
 				style == SCE_PL_POD_VERB);
 
 		case SCLEX_R: