diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 948f2dfab21..e351f65efb7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-02-16  Gary Benson  <gbenson@redhat.com>
+
+	* gnu/gcj/tools/gcj_dbtool/Main.java
+	(bytesToString): Don't lose zeros from within the digest.
+
 2007-02-15  Andrew Haley  <aph@redhat.com>
 
 	* Makefile.am (nat_source_files): Remove
diff --git a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class
index 906431cb7a6..b0d8604d5f7 100644
Binary files a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class and b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Fileset.class differ
diff --git a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class
index c785ed41bf7..f5cd28369fe 100644
Binary files a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class and b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Main.class differ
diff --git a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class
index 2ddd589f87e..a23f18f2f81 100644
Binary files a/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class and b/libjava/classpath/lib/gnu/gcj/tools/gcj_dbtool/Tokenizer.class differ
diff --git a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
index c34aa7bc0a9..b6ba9753000 100644
--- a/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
+++ b/libjava/gnu/gcj/tools/gcj_dbtool/Main.java
@@ -429,7 +429,12 @@ public class Main
     StringBuffer hexBytes = new StringBuffer();
     int length = b.length;
     for (int i = 0; i < length; ++i)
-      hexBytes.append(Integer.toHexString(b[i] & 0xff));
+      {
+	int v = b[i] & 0xff;
+	if (v < 16)
+	  hexBytes.append('0');
+	hexBytes.append(Integer.toHexString(v));
+      }
     return hexBytes.toString();
   }