diff --git a/smalidea/src/main/antlr3/smalideaParser.g b/smalidea/src/main/antlr3/smalideaParser.g
index 43b138a7..80bfe527 100644
--- a/smalidea/src/main/antlr3/smalideaParser.g
+++ b/smalidea/src/main/antlr3/smalideaParser.g
@@ -340,20 +340,25 @@ class_descriptor
   : CLASS_DESCRIPTOR;
   finally { marker.done(SmaliElementTypes.CLASS_TYPE); }
 
+array_descriptor
+  @init { Marker marker = mark(); }
+  : ARRAY_DESCRIPTOR;
+  finally { marker.done(SmaliElementTypes.ARRAY_TYPE); }
+
 type_descriptor
   : VOID_TYPE
   | primitive_type
   | class_descriptor
-  | ARRAY_DESCRIPTOR;
+  | array_descriptor;
 
 nonvoid_type_descriptor
   : primitive_type
   | class_descriptor
-  | ARRAY_DESCRIPTOR;
+  | array_descriptor;
 
 reference_type_descriptor
   : class_descriptor
-  | ARRAY_DESCRIPTOR;
+  | array_descriptor;
 
 null_literal
   @init { Marker marker = mark(); }
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java
index 53aa8610..fbde9b0b 100644
--- a/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/SmaliElementTypes.java
@@ -93,4 +93,6 @@ public class SmaliElementTypes {
             new SmaliCompositeElementType("PRIMITIVE_TYPE", SmaliPrimitiveTypeElement.FACTORY);
     public static final SmaliCompositeElementType CLASS_TYPE =
             new SmaliCompositeElementType("CLASS_TYPE", SmaliClassTypeElement.FACTORY);
+    public static final SmaliCompositeElementType ARRAY_TYPE =
+            new SmaliCompositeElementType("ARRAY_TYPE", SmaliArrayTypeElement.FACTORY);
 }
diff --git a/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliArrayTypeElement.java b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliArrayTypeElement.java
new file mode 100644
index 00000000..6b49dfe7
--- /dev/null
+++ b/smalidea/src/main/java/org/jf/smalidea/psi/impl/SmaliArrayTypeElement.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2014, Google Inc.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ *     * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following disclaimer
+ * in the documentation and/or other materials provided with the
+ * distribution.
+ *     * Neither the name of Google Inc. nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.jf.smalidea.psi.impl;
+
+import org.jf.smalidea.psi.SmaliCompositeElementFactory;
+import org.jf.smalidea.psi.SmaliElementTypes;
+
+public class SmaliArrayTypeElement extends SmaliCompositeElement {
+    public static final SmaliCompositeElementFactory FACTORY = new SmaliCompositeElementFactory() {
+        @Override public SmaliCompositeElement createElement() {
+            return new SmaliArrayTypeElement();
+        }
+    };
+
+    public SmaliArrayTypeElement() {
+        super(SmaliElementTypes.ARRAY_TYPE);
+    }
+}