diff --git a/CHANGES.txt b/CHANGES.txt
index 8bbfb5719fb..fca2b433427 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -29,6 +29,7 @@ Hbase Change Log
    HBASE-473   When a table is deleted, master sends multiple close messages to
                the region server
    HBASE-490   Doubly-assigned .META.; master uses one and clients another
+   HBASE-492   hbase TRUNK does not build against hadoop TRUNK
    
   IMPROVEMENTS
    HBASE-415   Rewrite leases to use DelayedBlockingQueue instead of polling
diff --git a/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-core.jar b/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-core.jar
deleted file mode 100644
index c5f1dc69baa..00000000000
Binary files a/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-core.jar and /dev/null differ
diff --git a/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar b/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar
new file mode 100644
index 00000000000..d7e564ceae1
Binary files /dev/null and b/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar differ
diff --git a/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-test.jar b/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar
old mode 100644
new mode 100755
similarity index 53%
rename from lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-test.jar
rename to lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar
index f482cb20f6c..c69b4e45f8a
Binary files a/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-test.jar and b/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar differ
diff --git a/src/test/hbase-site.xml b/src/test/hbase-site.xml
index 131b40a915a..851acc40225 100644
--- a/src/test/hbase-site.xml
+++ b/src/test/hbase-site.xml
@@ -107,4 +107,8 @@
     Keep the maximum filesize small so we split more often in tests.
     </description>
   </property>
+  <property>
+    <name>hadoop.log.dir</name>
+    <value>${user.dir}/logs</value>
+  </property>
 </configuration>
diff --git a/src/test/org/apache/hadoop/hbase/MultiRegionTable.java b/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
index ab83dd12fcf..ff310c35093 100644
--- a/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
+++ b/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
@@ -42,6 +42,15 @@ import org.apache.hadoop.hbase.regionserver.HRegionServer;
 public class MultiRegionTable extends HBaseTestCase {
   static final Log LOG = LogFactory.getLog(MultiRegionTable.class.getName());
 
+  /** {@inheritDoc} */
+  @Override
+  public void setUp() throws Exception {
+    // These are needed for the new and improved Map/Reduce framework
+    System.setProperty("hadoop.log.dir", conf.get("hadoop.log.dir"));
+    conf.set("mapred.output.dir", conf.get("hadoop.tmp.dir"));
+    super.setUp();
+  }
+
   /**
    * Make a multi-region table.  Presumption is that table already exists and
    * that there is only one regionserver. Makes it multi-region by filling with
@@ -187,7 +196,7 @@ public class MultiRegionTable extends HBaseTestCase {
       if (splitB == null) {
         LOG.info("splitB was already null. Assuming it was previously compacted.");
       } else {
-        LOG.info("Daughter splitB: " + splitA.getRegionName());
+        LOG.info("Daughter splitB: " + splitB.getRegionName());
 
         // Call second split.
         compact(cluster, splitB);
diff --git a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
index 69cba3c1716..37356682343 100644
--- a/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
+++ b/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
@@ -161,8 +161,8 @@ public class PerformanceEvaluation implements HConstants {
     }
     
     /** {@inheritDoc} */
-    public void map(@SuppressWarnings("unused") final WritableComparable key,
-      final Writable value, final OutputCollector output,
+    public void map(@SuppressWarnings("unused") final Object key,
+      final Object value, final OutputCollector output,
       final Reporter reporter)
     throws IOException {
       Matcher m = LINE_PATTERN.matcher(((Text)value).toString());