--- a/packages/hal/cortexm/lm3s/ek_lm3s811/current/ChangeLog
+++ b/packages/hal/cortexm/lm3s/ek_lm3s811/current/ChangeLog
@@ -1,3 +1,11 @@
+2011-02-09  John Dallaway  <john@dallaway.org.uk>
+
+	* doc/ek_lm3s811.sgml: Eliminate underscores in SGML ID strings. They
+	cause problems for some installations of openjade.
+
+	* cdl/hal_cortexm_ek_lm3s811.cdl: Fix documentation filename to match
+	the above change.
+
 2011-01-18  Christophe Coutand  <ccoutand@stmi.com>
 
 	* cdl/hal_cortexm_ek_lm3s811.cdl:

--- a/packages/hal/cortexm/lm3s/ek_lm3s811/current/cdl/hal_cortexm_ek_lm3s811.cdl
+++ b/packages/hal/cortexm/lm3s/ek_lm3s811/current/cdl/hal_cortexm_ek_lm3s811.cdl
@@ -49,7 +49,7 @@
 
 cdl_package CYGPKG_HAL_CORTEXM_EK_LM3S811 {
     display       "Stellaris EK-LM3S811 Development Board HAL"
-    doc           ref/hal-cortexm-lm3s-ek_lm3s811.html
+    doc           ref/hal-cortexm-lm3s-ek-lm3s811.html
     parent        CYGPKG_HAL_CORTEXM_LM3S8XX
     define_header hal_cortexm_ek_lm3s811.h
     include_dir   cyg/hal

--- a/packages/hal/cortexm/lm3s/ek_lm3s811/current/doc/ek_lm3s811.sgml
+++ b/packages/hal/cortexm/lm3s/ek_lm3s811/current/doc/ek_lm3s811.sgml
@@ -34,9 +34,9 @@
 
 <!-- }}} -->
 
-<part id="hal-cortexm-lm3s-ek_lm3s811"><title>Stellaris EKK-LM3S811 Board Support</title>
+<part id="hal-cortexm-lm3s-ek-lm3s811"><title>Stellaris EKK-LM3S811 Board Support</title>
 
-<refentry id="lm3s-ek_lm3s811">
+<refentry id="lm3s-ek-lm3s811">
   <refmeta>
     <refentrytitle>Overview</refentrytitle>
   </refmeta>
@@ -45,7 +45,7 @@
     <refpurpose>Overview</refpurpose>
   </refnamediv>
 
-  <refsect1 id="lm3s-ek_lm3s811-description"><title>Description</title>
+  <refsect1 id="lm3s-ek-lm3s811-description"><title>Description</title>
     <para>
 The Stellaris EKK-LM3S811 evaluation kit uses the Stellaris LM3S811 microcontroller from the 
 800 Series. The LM3S811 is an ARM cortex-M3 based microcontroller with 64KB of FLASH 
@@ -62,7 +62,7 @@ minimum allowed size of CYGNUM_HAL_STACK
     </para>
   </refsect1>
 
-  <refsect1 id="lm3s-ek_lm3s811-config"><title>Configuration</title>
+  <refsect1 id="lm3s-ek-lm3s811-config"><title>Configuration</title>
     <para>
 The minimum board configuration includes the Microcontroller HAL alongs with the ADC and I2C device 
 drivers.
@@ -114,7 +114,7 @@ single-ended IOs.
     </variablelist>
   </refsect1>
 
-  <refsect1 id="lm3s-ek_lm3s811-rebuild"><title>Build ROM type applications</title>
+  <refsect1 id="lm3s-ek-lm3s811-rebuild"><title>Build ROM type applications</title>
     <para>
 The steps needed to build the HAL library for the EKK-LM3S811 board are:
     </para>