diff --git a/atom.pages.inc b/atom.pages.inc
index b55ac0a..101538c 100644
--- a/atom.pages.inc
+++ b/atom.pages.inc
@@ -127,6 +127,7 @@ function _atom_print_feed(array $nids, array $feed_info) {
       'updated' => $node->changed,
       'author' => $node->name ? $node->name : variable_get('anonymous', 'Anonymous'),
       'content' => $item_text,
+      'language' => isset($node->language) ? $node->language : 'und',
       // @todo How to have summary and/or full body?
     );
 
@@ -184,7 +185,12 @@ function theme_atom_feed_item($variables) {
     'author' => '',
   );
 
-  $output = "  <entry>\n";
+  if ($variables['item']['language'] != 'und') {
+    $output = "  <entry xml:lang=\"" . $variables['item']['language'] . "\">\n";
+  }
+  else {
+    $output = "  <entry>\n";
+  }
   $output .= "    <id>" . check_plain($variables['item']['id']) . "</id>\n";
   $output .= "    <link rel=\"alternate\" type=\"text/html\" href=\"" . check_plain($variables['link']) . "\" />\n";
   $output .= "    <published>" . gmdate(DATE_ATOM, $variables['item']['published']) . "</published>\n";