diff --git a/docs/LangRef.html b/docs/LangRef.html
index c07d0e0d592..313bf833471 100644
--- a/docs/LangRef.html
+++ b/docs/LangRef.html
@@ -3629,7 +3629,7 @@ the pointer before continuing calculation.</p>
 <p>The type of each index argument depends on the type it is indexing into.
 When indexing into a (packed) structure, only <tt>i32</tt> integer
 <b>constants</b> are allowed.  When indexing into an array, pointer or vector,
-only integers of 16, 32 or 64 bits are allowed (also non-constants). 16-bit
+integers of any width are allowed (also non-constants). 16-bit
 values will be sign extended to 32-bits if required, and 32-bit values
 will be sign extended to 64-bits if required.</p>
 
diff --git a/lib/VMCore/Type.cpp b/lib/VMCore/Type.cpp
index c85395f6201..4a53fcf6f83 100644
--- a/lib/VMCore/Type.cpp
+++ b/lib/VMCore/Type.cpp
@@ -1410,9 +1410,8 @@ void PointerType::typeBecameConcrete(const DerivedType *AbsTy) {
 }
 
 bool SequentialType::indexValid(const Value *V) const {
-  if (const IntegerType *IT = dyn_cast<IntegerType>(V->getType())) 
-    return IT->getBitWidth() == 16 || IT->getBitWidth() == 32 ||
-           IT->getBitWidth() == 64;
+  if (isa<IntegerType>(V->getType())) 
+    return true;
   return false;
 }
 
diff --git a/test/Assembler/getelementptr_struct.ll b/test/Assembler/getelementptr_struct.ll
new file mode 100644
index 00000000000..c8779a64077
--- /dev/null
+++ b/test/Assembler/getelementptr_struct.ll
@@ -0,0 +1,12 @@
+; RUN: not llvm-as < %s >/dev/null |& grep {invalid getelementptr indices}
+; Test the case of a incorrect indices type into struct
+
+%RT = type { i8 , [10 x [20 x i32]], i8  }
+%ST = type { i32, double, %RT }
+
+define i32* @foo(%ST* %s) {
+entry:
+  %reg = getelementptr %ST* %s, i32 1, i64 2, i32 1, i32 5, i32 13
+  ret i32* %reg
+}
+