diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 3e7c1ce8334..db22179ae53 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,7 @@
+2002-01-08  Tom Tromey  <tromey@redhat.com>
+
+	* resolve.cc (_Jv_PrepareClass): Enable verifier.
+
 2002-01-07  Andreas Tobler <a.tobler@schweiz.ch>
 
 	* java/lang/reflect/natMethod.cc: Don't include alloca.h.
diff --git a/libjava/resolve.cc b/libjava/resolve.cc
index ba397c9b119..fba6cba8e13 100644
--- a/libjava/resolve.cc
+++ b/libjava/resolve.cc
@@ -1,6 +1,6 @@
 // resolve.cc - Code for linking and resolving classes and pool entries.
 
-/* Copyright (C) 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001 , 2002 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -628,8 +628,7 @@ _Jv_PrepareClass(jclass klass)
       else if (imeth != 0)		// it could be abstract
 	{
 	  _Jv_InterpMethod *im = reinterpret_cast<_Jv_InterpMethod *> (imeth);
-	  // FIXME: enable once verifier is more fully tested.
-	  // _Jv_VerifyMethod (im);
+	  _Jv_VerifyMethod (im);
 	  clz->methods[i].ncode = im->ncode ();
 	}
     }