diff --git a/ChangeLog b/ChangeLog
index 1403a07dc6..4a750e2328 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 29 20:23:05 2010  Keiju Ishitsuka  <keiju@ruby-lang.org>
+
+	* lib/matrix.rb(Vector#each2, Vector#collect2): add type check for
+	Integer[Bug #2495].
+
 Mon Mar 29 19:45:09 2010  Tanaka Akira  <akr@fsij.org>
 
 	* time.c: wide value condition changed.
diff --git a/lib/matrix.rb b/lib/matrix.rb
index b3a7e79fe5..7afc7d5978 100644
--- a/lib/matrix.rb
+++ b/lib/matrix.rb
@@ -1154,6 +1154,7 @@ class Vector
   # Iterate over the elements of this vector and +v+ in conjunction.
   #
   def each2(v) # :yield: e1, e2
+    raise TypeError, "Integer is not like Vector" if v.kind_of?(Integer)
     Vector.Raise ErrDimensionMismatch if size != v.size
     return to_enum(:each2, v) unless block_given?
     size.times do |i|
@@ -1167,6 +1168,7 @@ class Vector
   # in conjunction.
   #
   def collect2(v) # :yield: e1, e2
+    raise TypeError, "Integer is not like Vector" if v.kind_of?(Integer)
     Vector.Raise ErrDimensionMismatch if size != v.size
     return to_enum(:collect2, v) unless block_given?
     size.times.collect do |i|