diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 0fe6a78abc34..fef9f7b393b4 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2006-07-20  Keith Seitz  <keiths@redhat.com>
+
+	* jvmti.cc (_Jv_JVMTI_DisposeEnvironment): New function.
+	(_Jv_JVMTI_Interface): Define DisposeEnvironment method.
+
 2006-07-20  Keith Seitz  <keiths@redhat.com>
 
 	* include/jvm.h (_Jv_GetJVMTIEnv): Declare.
diff --git a/libjava/jvmti.cc b/libjava/jvmti.cc
index 8bebef8c219f..16a28f179f77 100644
--- a/libjava/jvmti.cc
+++ b/libjava/jvmti.cc
@@ -16,6 +16,14 @@ details.  */
 #define RESERVED NULL
 #define UNIMPLEMENTED NULL
 
+static jvmtiError
+_Jv_JVMTI_DisposeEnvironment (jvmtiEnv *env)
+{
+  // All we need to do is free memory allocated by _Jv_GetJVMTIEnv
+  _Jv_Free (env);
+  return JVMTI_ERROR_NONE;
+}
+
 struct _Jv_jvmtiEnv _Jv_JVMTI_Interface =
 {
   RESERVED,			// reserved1
@@ -144,7 +152,7 @@ struct _Jv_jvmtiEnv _Jv_JVMTI_Interface =
   UNIMPLEMENTED,		// GetExtensionFunctions
   UNIMPLEMENTED,		// GetExtensionEvents
   UNIMPLEMENTED,		// SetExtensionEventCallback
-  UNIMPLEMENTED,		// DisposeEnvironment
+  _Jv_JVMTI_DisposeEnvironment,	// DisposeEnvironment
   UNIMPLEMENTED,		// GetErrorName
   UNIMPLEMENTED,		// GetJLocationFormat
   UNIMPLEMENTED,		// GetSystemProperties