diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1644cc532..ff298ed66 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-13  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-exp.el (org-export-as-html): Make sure that each <img> tag
+	has an `alt' attribute, to ensure XHTML validation.
+
 2008-11-12  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-publish.el (org-publish-attachment): Allow publishing to
diff --git a/lisp/org-exp.el b/lisp/org-exp.el
index 3365087f7..d9ed2560f 100644
--- a/lisp/org-exp.el
+++ b/lisp/org-exp.el
@@ -3250,7 +3250,10 @@ lang=\"%s\" xml:lang=\"%s\">
 	      (if (and (or (eq t org-export-html-inline-images)
 			   (and org-export-html-inline-images (not descp)))
 		       (org-file-image-p path))
-		  (setq rpl (concat "<img src=\"" type ":" path "\"" attr "/>"))
+		  (setq rpl (concat "<img src=\"" type ":" path "\""
+				    (if (string-match "\\<alt=" attr)
+					attr (concat attr " alt=\"" path "\""))
+				    "/>"))
 		(setq link (concat type ":" path))
 		(setq rpl (concat "<a href=\"" 
 				  (org-export-html-format-href link)
@@ -3308,7 +3311,11 @@ lang=\"%s\" xml:lang=\"%s\">
 				   (or (eq t org-export-html-inline-images)
 				       (and org-export-html-inline-images
 					    (not descp))))
-			      (concat "<img src=\"" thefile "\"" attr "/>")
+			      (concat "<img src=\"" thefile "\""
+				      (if (string-match "alt=" attr)
+					  attr
+					(concat attr " alt=\""
+						thefile "\"")) "/>")
 			    (concat "<a href=\"" thefile "\"" attr ">"
 				    (org-export-html-format-desc desc)
 				    "</a>")))