diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 5c6ad81e1b3..9607a3dcd89 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,16 @@
+2007-05-03  Thomas Fitzsimmons  <fitzsim@redhat.com>
+
+	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=237304
+	* Makefile.in: Regenerate.
+	* scripts/makemake.tcl (scan_directory): Treat default.css as a
+	property file.
+	* classpath/javax/swing/text/html/default.css: Move to...
+	* classpath/resource/javax/swing/text/html/default.css: New file.
+	* classpath/javax/swing/text/html/HTMLEditorKit.java
+	(getStyleSheet): Throw RuntimeException when style loading fails.
+	* sources.am (property_files): Add
+	classpath/resource/javax/swing/text/html/default.css.
+
 2007-05-02  Tom Tromey  <tromey@redhat.com>
 
 	https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=238755
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index b454a4ae7bc..369c1913222 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7786,6 +7786,7 @@ property_files = \
   classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
   classpath/resource/java/util/iso4217.properties \
   classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
+  classpath/resource/javax/swing/text/html/default.css \
   classpath/resource/org/ietf/jgss/MessagesBundle.properties \
   classpath/resource/sun/rmi/rmic/messages.properties \
   classpath/resource/com/sun/tools/javac/messages.properties \
diff --git a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
index 0ede1c74ed9..cc61889d76f 100644
--- a/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
+++ b/libjava/classpath/javax/swing/text/html/HTMLEditorKit.java
@@ -1462,7 +1462,7 @@ public class HTMLEditorKit
           }
         catch (IOException ex)
           {
-            // No style available.
+            throw new RuntimeException("No style available.", ex);
           }
       }
     return styleSheet;
diff --git a/libjava/classpath/javax/swing/text/html/default.css b/libjava/classpath/resource/javax/swing/text/html/default.css
similarity index 100%
rename from libjava/classpath/javax/swing/text/html/default.css
rename to libjava/classpath/resource/javax/swing/text/html/default.css
diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl
index 0fc06fce15d..ab8a85d2c29 100755
--- a/libjava/scripts/makemake.tcl
+++ b/libjava/scripts/makemake.tcl
@@ -228,6 +228,9 @@ proc scan_directory {basedir subdir} {
 	# We assume there aren't any overrides.
 	lappend properties_files $basedir/$subdir/$file
       }
+    } elseif {[string match *.css $file]} {
+	# Special case for default.css needed by javax.swing.text.html.
+	lappend properties_files $basedir/$subdir/$file
     } elseif {[file isdirectory $file]} {
       lappend subdirs $subdir/$file
     } elseif {$subdir == "META-INF/services"} {
diff --git a/libjava/sources.am b/libjava/sources.am
index de98ee6ce10..b02dfb709dc 100644
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -9005,6 +9005,7 @@ property_files = \
   classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
   classpath/resource/java/util/iso4217.properties \
   classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
+  classpath/resource/javax/swing/text/html/default.css \
   classpath/resource/org/ietf/jgss/MessagesBundle.properties \
   classpath/resource/sun/rmi/rmic/messages.properties \
   classpath/resource/com/sun/tools/javac/messages.properties \