diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6bdb8b8da9786846442c0a4709ac65ffb0677c80..74ebbac58a1b84bc51e9854c0f0241deb5d5f86f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -3,6 +3,9 @@
 	* gnu/classpath/jdwp/natVMVirtualMachine.cc: Mark unused parameters
 	in methods and reformat.
 
+	* gnu/classpath/jdwp/natVMFrame.cc: Mark unused parameters with
+	MAYBE_UNUSED.
+
 2007-01-18  Keith Seitz  <keiths@redhat.com>
 
 	From Macro Trudel <mtrudel@gmx.ch>:
diff --git a/libjava/gnu/classpath/jdwp/natVMFrame.cc b/libjava/gnu/classpath/jdwp/natVMFrame.cc
index de3b844f4a4c521043d86b9778d0aa23eaae915e..0c0085256b35cf7f61064839593f58628e9bf3e2 100644
--- a/libjava/gnu/classpath/jdwp/natVMFrame.cc
+++ b/libjava/gnu/classpath/jdwp/natVMFrame.cc
@@ -1,6 +1,6 @@
 // natFrame.cc -- native support for VMFrame.java
 
-/* Copyright (C) 2006 Free Software Foundation
+/* Copyright (C) 2006, 2007 Free Software Foundation
 
    This file is part of libgcj.
 
@@ -9,18 +9,20 @@ Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
 details. */
 
 #include <gcj/cni.h>
+#include <jvm.h>
 
 #include <gnu/classpath/jdwp/VMFrame.h>
 
 using namespace java::lang;
 
 Object*
-gnu::classpath::jdwp::VMFrame::getValue (jint slot)
+gnu::classpath::jdwp::VMFrame::getValue (MAYBE_UNUSED jint slot)
 {
   return 0;
 }
 
 void
-gnu::classpath::jdwp::VMFrame::setValue (jint slot, Object* value)
+gnu::classpath::jdwp::VMFrame::setValue (MAYBE_UNUSED jint slot,
+					 MAYBE_UNUSED Object* value)
 {
 }