diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index a2f8b8aafcf87050aaf9de19b9d9d562600e3580..1d46779ddfd2bb55d5e53ae389ec1f16bf38686f 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-29  Dirk Mueller  <dmueller@suse.de>
+
+	PR c++/16307
+	* typeck.c (build_array_ref): Warn for char subscriptions
+	on pointers.
+
 2006-10-29  Kazu Hirata  <kazu@codesourcery.com>
 
 	* decl.c: Fix a comment typo.
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 0094323db753ce6a7eb98dd5c8e224a3a33ae101..46eee41b6dfc8495e467e720695f8c67682a946f 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -2489,6 +2489,8 @@ build_array_ref (tree array, tree idx)
 	return error_mark_node;
       }
 
+    warn_array_subscript_with_type_char (idx);
+
     return build_indirect_ref (cp_build_binary_op (PLUS_EXPR, ar, ind),
 			       "array indexing");
   }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index de569bb604fd723fb1701f2bd3cc9fa7e5e806ea..f81e5837714b2a74c12c871c35124fb28c2b1224 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-29  Dirk Mueller  <dmueller@suse.de>
+
+	PR c++/16307
+	* g++.dg/warn/Wchar-subscripts-2.C: New testcase.
+
 2006-10-29  Roger Sayle  <roger@eyesopen.com>
 
 	PR tree-optimization/15458
diff --git a/gcc/testsuite/g++.dg/warn/Wchar-subscripts-2.C b/gcc/testsuite/g++.dg/warn/Wchar-subscripts-2.C
new file mode 100644
index 0000000000000000000000000000000000000000..5d19cd37ea43e8ed18887666d58f84fee5087635
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wchar-subscripts-2.C
@@ -0,0 +1,13 @@
+/* PR c++/16307 */
+// { dg-do compile }
+// { dg-options "-Wchar-subscripts" }
+
+char foo (const char *s)
+{
+    return s [s ['\x80']];          // { dg-warning "array subscript" }
+}
+
+int main ()
+{
+    foo ("\x80");
+}