diff --git a/lib/views/atom.tsx b/lib/views/atom.tsx
index e2565bfe3494..71ccabd688d5 100644
--- a/lib/views/atom.tsx
+++ b/lib/views/atom.tsx
@@ -3,15 +3,14 @@ import type { FC } from 'hono/jsx';
 import type { Data } from '@/types';
 
 const RSS: FC<{ data: Data }> = ({ data }) => (
-    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:rsshub="http://rsshub.app/xml/schemas">
+    <feed xmlns="http://www.w3.org/2005/Atom" xmlns:rsshub="http://rsshub.app/xml/schemas" xml:lang={data.language || 'en'}>
         <title>{data.title || 'RSSHub'}</title>
-        <link href={data.link || 'https://docs.rsshub.app'} />
+        <link rel="alternate" href={data.link || 'https://docs.rsshub.app'} />
+        <link rel="self" href={data.atomlink} type="application/atom+xml" />
         <id>{data.id || data.link}</id>
         <subtitle>{data.description || data.title} - Powered by RSSHub</subtitle>
         <generator>RSSHub</generator>
-        <webMaster>contact@rsshub.app (RSSHub)</webMaster>
-        <language>{data.language || 'en'}</language>
-        <updated>{data.lastBuildDate}</updated>
+        <updated>{new Date(data.lastBuildDate || new Date()).toISOString()}</updated>
         <author>
             <name>{data.author || 'RSSHub'}</name>
         </author>
@@ -21,13 +20,11 @@ const RSS: FC<{ data: Data }> = ({ data }) => (
         {data.item?.map((item) => (
             <entry>
                 <title>{item.title}</title>
-                <content type="html" src={item.link}>
-                    {item.description}
-                </content>
+                <content type="html">{item.description}</content>
                 <link href={item.link} />
                 <id>{item.guid || item.link || item.title}</id>
-                {item.pubDate && <published>{item.pubDate}</published>}
-                {item.updated && <updated>{item.updated || item.pubDate}</updated>}
+                {item.pubDate && <published>{new Date(item.pubDate).toISOString()}</published>}
+                <updated>{new Date(item.updated || item.pubDate || new Date()).toISOString()}</updated>
                 {item.author && (
                     <author>
                         <name>{item.author}</name>