diff -u openjdk-6-6b18-1.8/debian/changelog openjdk-6-6b18-1.8/debian/changelog
--- openjdk-6-6b18-1.8/debian/changelog
+++ openjdk-6-6b18-1.8/debian/changelog
@@ -1,3 +1,11 @@
+openjdk-6 (6b18-1.8-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix Hitachi SH configury. Closes: #575346.
+    Add debian/patches/sh4_fix_configure.diff.
+
+ -- Nobuhiro Iwamatsu <iwamatsu@debian.org>  Tue, 20 Apr 2010 01:27:02 +0000
+
 openjdk-6 (6b18-1.8-1) unstable; urgency=low
 
   * Upload to unstable.
diff -u openjdk-6-6b18-1.8/debian/rules openjdk-6-6b18-1.8/debian/rules
--- openjdk-6-6b18-1.8/debian/rules
+++ openjdk-6-6b18-1.8/debian/rules
@@ -247,6 +247,7 @@
 	debian/patches/ld-symbolic-functions.diff
 endif
 DISTRIBUTION_PATCHES += \
+	debian/patches/sh4_fix_configure.diff \
 	debian/patches/set-exec-name.diff \
 	debian/patches/shebang.diff \
 	debian/patches/jexec.diff \
--- openjdk-6-6b18-1.8.orig/debian/patches/sh4_fix_configure.diff
+++ openjdk-6-6b18-1.8/debian/patches/sh4_fix_configure.diff
@@ -0,0 +1,11 @@
+--- ../configure	2010-04-19 02:39:46.000000000 +0000
++++ ../configure	2010-04-19 02:39:58.000000000 +0000
+@@ -7877,7 +7877,7 @@
+       CROSS_TARGET_ARCH=s390x
+       ARCHFLAG="-m64"
+        ;;
+-    sh*-*-*)
++    sh*)
+       BUILD_ARCH_DIR=sh
+       INSTALL_ARCH_DIR=sh
+       JRE_ARCH_DIR=sh