diff -Nru java-package-0.41/debian/changelog java-package-0.41-ea/debian/changelog
--- java-package-0.41/debian/changelog	2008-03-21 18:20:38.000000000 +0200
+++ java-package-0.41-ea/debian/changelog	2008-12-17 15:13:26.000000000 +0200
@@ -1,3 +1,9 @@
+java-package (0.41.1) intrepid; urgency=low
+
+  * Added support for Java 6 Update x Early Access beta y.
+
+ -- Tommi Saviranta <tsaviran@wox-2.cs.helsinki.fi>  Wed, 17 Dec 2008 15:12:36 +0200
+
 java-package (0.41) unstable; urgency=low
 
   * Added support for new SUN JDK/JRE for amd64 downloads. Thanks to
diff -Nru java-package-0.41/lib/j2se.sh java-package-0.41-ea/lib/j2se.sh
--- java-package-0.41/lib/j2se.sh	2007-09-14 18:28:11.000000000 +0300
+++ java-package-0.41-ea/lib/j2se.sh	2008-12-17 14:47:15.000000000 +0200
@@ -66,6 +66,8 @@
 }
 
 function j2se_install_scripts() {
+    local ea
+    [ $j2se_version_is_ea ] && ea=".ea"
     cat > "$debian_dir/postinst" << EOF
 #!/bin/bash
 
@@ -75,7 +77,7 @@
 EOF
     cat "$lib_dir/install-common" >> "$debian_dir/postinst"
 
-    cat "$lib_dir/$j2se_package/install" >> "$debian_dir/postinst"
+    cat "$lib_dir/$j2se_package/install$ea" >> "$debian_dir/postinst"
 
     cat >> "$debian_dir/postinst" << EOF
 fi
@@ -96,7 +98,7 @@
 EOF
     cat "$lib_dir/remove-common" >> "$debian_dir/prerm"
 
-    cat "$lib_dir/$j2se_package/remove" >> "$debian_dir/prerm"
+    cat "$lib_dir/$j2se_package/remove$ea" >> "$debian_dir/prerm"
 
     cat >> "$debian_dir/prerm" << EOF
     ;;
diff -Nru java-package-0.41/lib/sun-j2re.sh java-package-0.41-ea/lib/sun-j2re.sh
--- java-package-0.41/lib/sun-j2re.sh	2008-03-21 18:18:03.000000000 +0200
+++ java-package-0.41-ea/lib/sun-j2re.sh	2008-12-17 14:47:19.000000000 +0200
@@ -69,6 +69,13 @@
 	    j2se_expected_min_size=16 # 16542512 bytes
 	    found=true
 	    ;;
+#	 jre-6u 1    2     -ea-bin-b 0    2     -linux-amd64- 08 _ dec _ 2008 .bin
+	"jre-6u"[0-9][0-9]"-ea-bin-b"[0-2][0-2]"-linux-amd64-"??"_"???"_"????".bin") # SUPPORTED
+	    j2se_version=1.6.0+ea${archive_name:6:2}b${archive_name:17:2}${revision}
+	    j2se_expected_min_size=16 # 16542512 bytes
+	    j2se_version_is_ea=yes
+	    found=true
+	    ;;
       esac
       ;;
   esac
diff -Nru java-package-0.41/sun-j2re1.6/install.ea java-package-0.41-ea/sun-j2re1.6/install.ea
--- java-package-0.41/sun-j2re1.6/install.ea	1970-01-01 02:00:00.000000000 +0200
+++ java-package-0.41-ea/sun-j2re1.6/install.ea	2008-12-17 15:00:13.000000000 +0200
@@ -0,0 +1,64 @@
+suffix=j2re1.6-sun
+j2se_base="/usr/lib/$suffix"
+priority=316
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+# alternative <program>
+function program_alternative() {
+    local program="$1"
+    update-alternatives \
+	--install "/usr/bin/$program" "$program" \
+	"$j2se_base/bin/$program" "$priority" \
+	--slave "/usr/share/man/man1/$program.1.gz" "$program.1.gz" \
+	"$j2se_base/man/man1/$program.1.gz"
+}
+
+# kinit, klist, and ktab not installed at this
+# time; handling of /etc/krb5.conf not addressed
+program_alternative ControlPanel
+program_alternative java
+program_alternative javaws
+program_alternative keytool
+program_alternative orbd
+program_alternative pack200
+program_alternative policytool
+program_alternative rmid
+program_alternative rmiregistry
+program_alternative servertool
+program_alternative tnameserv
+program_alternative unpack200
+
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
+
+# assemble the plugin path
+plugin_dir="$j2se_base/lib/$arch_dir"
+
+# mozilla
+mozilla_dir="/usr/lib/mozilla/plugins"
+[ -d "$mozilla_dir" ] || install -d -m 755 "$mozilla_dir"
+update-alternatives \
+    --install "$mozilla_dir/libjavaplugin.so" \
+	"mozilla-javaplugin.so" \
+    	"$plugin_dir/libnpjp2.so" "$priority"
+
+# firefox
+firefox_dir="/usr/lib/mozilla-firefox/plugins"
+[ -d "$firefox_dir" ] || install -d -m 755 "$firefox_dir"
+update-alternatives \
+    --install "$firefox_dir/libjavaplugin.so" \
+	"firefox-javaplugin.so" \
+    	"$plugin_dir/libnpjp2.so" "$priority"
+
+# iceweasel
+iceweasel_dir="/usr/lib/mozilla-iceweasel/plugins"
+[ -d "$iceweasel_dir" ] || install -d -m 755 "$iceweasel_dir"
+update-alternatives \
+    --install "$iceweasel_dir/libjavaplugin.so" \
+	"iceweasel-javaplugin.so" \
+    	"$plugin_dir/libnpjp2.so" "$priority"
+
diff -Nru java-package-0.41/sun-j2re1.6/remove.ea java-package-0.41-ea/sun-j2re1.6/remove.ea
--- java-package-0.41/sun-j2re1.6/remove.ea	1970-01-01 02:00:00.000000000 +0200
+++ java-package-0.41-ea/sun-j2re1.6/remove.ea	2008-12-17 15:00:32.000000000 +0200
@@ -0,0 +1,45 @@
+suffix=j2re1.6-sun
+j2se_base="/usr/lib/$suffix"
+
+if [ ! -e "$j2se_base/debian/info" ]; then
+    exit 0
+fi
+
+# alternative <program>
+function program_alternative() {
+    local program="$1"
+    update-alternatives \
+	--remove "$program" "$j2se_base/bin/$program"
+}
+
+program_alternative ControlPanel
+program_alternative java
+program_alternative javaws
+program_alternative keytool
+program_alternative orbd
+program_alternative pack200
+program_alternative policytool
+program_alternative rmid
+program_alternative rmiregistry
+program_alternative servertool
+program_alternative tnameserv
+program_alternative unpack200
+
+# derive the architecture-specific 
+# directory for the plugin
+arch_dir="$(dpkg --print-architecture)"
+
+# assemble the plugin path
+plugin_dir="$j2se_base/lib/$arch_dir"
+
+# mozilla
+update-alternatives \
+    --remove "mozilla-javaplugin.so" "$plugin_dir/libnpjp2.so"
+
+# firefox
+update-alternatives \
+    --remove "firefox-javaplugin.so" "$plugin_dir/libnpjp2.so"
+
+# iceweasel
+update-alternatives \
+    --remove "iceweasel-javaplugin.so" "$plugin_dir/libnpjp2.so"