diff --git a/website/themes/beastie/layouts/news/list.html b/website/themes/beastie/layouts/news/list.html
index b4b175fbb0..26409dfdfe 100644
--- a/website/themes/beastie/layouts/news/list.html
+++ b/website/themes/beastie/layouts/news/list.html
@@ -1,72 +1,79 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
-        {{ $newsCounter := 0 }}
+        {{ $newsDayCounter := 1 }}
+        {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h1>{{ i18n $month }} {{ $year }}</h1>
 
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
+                      {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+                      {{ if eq $newsDayCur $newsDayPrev }}
+                        {{ $newsDayCounter = add $newsDayCounter 1 }}
+                      {{ else }}
+                        {{ $newsDayCounter = 1 }}
+                      {{ end }}
                       <li>
                         <p class="localized">
-                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"></a>
+                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
-                      {{ $newsCounter = add $newsCounter 1 }}
+                      {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/news/news.rss.xml b/website/themes/beastie/layouts/news/news.rss.xml
index d119936093..f109d6ca67 100644
--- a/website/themes/beastie/layouts/news/news.rss.xml
+++ b/website/themes/beastie/layouts/news/news.rss.xml
@@ -1,45 +1,54 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>FreeBSD News Flash</title>
     <link>https://www.FreeBSD.org/news/</link>
     <description>News from the FreeBSD Project</description>
     <language>en-us</language>
     <webMaster>freebsd-www@FreeBSD.org (Webmaster Team)</webMaster>
     <managingEditor>freebsd-www@FreeBSD.org (Webmaster Team)</managingEditor>
     <image>
       <url>https://www.FreeBSD.org/logo/logo-full.png</url>
       <title>FreeBSD News Flash</title>
       <link>https://www.FreeBSD.org/news/</link>
     </image>
     <atom:link href="https://www.FreeBSD.org/news/feed.xml" rel="self" type="application/rss+xml"/>
     {{ $data := index .Site.Data "en" }}
     {{ $newsData := $data.news }}
     {{ with $newsData.news }}
       {{ $newsCounter := 0 }}
+      {{ $newsDayCounter := 1 }}
+      {{ $newsDayPrev := false }}
         {{ range (sort .news "date" "desc") }}
           {{ if lt $newsCounter 10 }}
+            {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+            {{ if eq $newsDayCur $newsDayPrev }}
+              {{ $newsDayCounter = add $newsDayCounter 1 }}
+            {{ else }}
+              {{ $newsDayCounter = 1 }}
+            {{ end }}
             <item>
               {{ if .title }}
                 <title>
                   {{ $title := replaceRE "<a .*\">" "" .title }}
                   {{ $title = replaceRE "</a>" "" $title }}
                   {{ $title }}
                 </title>
               {{ end }}
               {{ if .description }}
                 <description>
                   {{ $description := replaceRE "<a .*\">" "" .description | safeHTML}}
                   {{ $description = replaceRE "</a>" "" $description | safeHTML}}
                   {{ $description }}
                 </description>
               {{ end }}
-              <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</link>
-              <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}</guid>
+              <link>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</link>
+              <guid>{{ absLangURL ($.Site.BaseURL) }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}</guid>
               <pubDate>{{ dateFormat "2006-01-02" .date }}</pubDate>
             </item>
+            {{ $newsCounter = add $newsCounter 1 }}
+            {{ $newsDayPrev = $newsDayCur }}
           {{ end }}
-        {{ $newsCounter = add $newsCounter 1 }}
       {{ end }}
     {{ end }}
   </channel>
 </rss>
diff --git a/website/themes/beastie/layouts/news/single.html b/website/themes/beastie/layouts/news/single.html
index b4b175fbb0..26409dfdfe 100644
--- a/website/themes/beastie/layouts/news/single.html
+++ b/website/themes/beastie/layouts/news/single.html
@@ -1,72 +1,79 @@
 {{ define "main" }}
   <div id="content">
     <div id="sidewrap">
       <div id="sidenav">
         {{ partial "sidenav.html" (dict "sidenavType" .Params.sidenav "data" .Site.Data "language" $.Site.Language.Lang ) }}
       </div>
       <div id="feedlinks">
         <ul>
           <li>
             <a href="{{ absLangURL ($.Site.BaseURL) }}news/feed.xml" title="FreeBSD RSS 2.0 Feed">RSS 2.0 Feed</a>
           </li>
         </ul>
       </div>
     </div>
     <div id="contentwrap">
       <h1>{{ .Title }}</h1>
       {{- .Content -}}
 
       {{ if .Params.loadNews }}
 
         {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
         {{ $newsData := "" }}
         {{ if (fileExists $newsPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $newsData = $data.news }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $newsData = $dataDefaultLanguage.news }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $newsData.news }}
           {{ range (sort .news "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
-        {{ $newsCounter := 0 }}
+        {{ $newsDayCounter := 1 }}
+        {{ $newsDayPrev := false }}
         {{ range $year := seq now.Year 2010 }}
           {{ range $month := seq 12 1 }}
             {{ $yearMonth := (printf "%d-%d" $year $month) }}
             {{ if in $yearsMonths $yearMonth }}
               <h1>{{ i18n $month }} {{ $year }}</h1>
 
               <ul>
                 {{ with $newsData.news }}
                   {{ range (sort .news "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
+                      {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+                      {{ if eq $newsDayCur $newsDayPrev }}
+                        {{ $newsDayCounter = add $newsDayCounter 1 }}
+                      {{ else }}
+                        {{ $newsDayCounter = 1 }}
+                      {{ end }}
                       <li>
                         <p class="localized">
-                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}"></a>
+                          <a id="{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}"></a>
                           <strong>{{ dateFormat "2" .date }} {{ i18n (dateFormat "1" .date) }}:</strong>
                           {{ .description | safeHTML }}
                         </p>
                       </li>
-                      {{ $newsCounter = add $newsCounter 1 }}
+                      {{ $newsDayPrev = $newsDayCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/partials/news.html b/website/themes/beastie/layouts/partials/news.html
index e3fb22646d..23b22fbaa7 100644
--- a/website/themes/beastie/layouts/partials/news.html
+++ b/website/themes/beastie/layouts/partials/news.html
@@ -1,34 +1,43 @@
 {{ $newsPath := (printf "data/%s/news/news.toml" $.Language.Lang) }}
 
 {{ $newsData := "" }}
 {{ if (fileExists $newsPath) -}}
   {{ $data := index .Site.Data $.Language.Lang }}
   {{ $newsData = $data.news }}
 {{ else }}
   {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
   {{ $newsData = $dataDefaultLanguage.news }}
 {{ end }}
 
 {{ with $newsData.news }}
   {{ $newsCounter := 0 }}
+  {{ $newsDayCounter := 1 }}
+  {{ $newsDayPrev := false }}
   {{ range (sort .news "date" "desc") }}
     {{ if lt $newsCounter 6 }}
+      {{ $newsDayCur := dateFormat "2006-01-02" .date }}
+      {{ if eq $newsDayCur $newsDayPrev }}
+        {{ $newsDayCounter = add $newsDayCounter 1 }}
+      {{ else }}
+        {{ $newsDayCounter = 1 }}
+      {{ end }}
     <p>
       <span class="txtdate">{{ dateFormat "2006-01-02" .date }}</span>
       <br />
-      <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsCounter }}">
+      <a href="{{.Site.BaseURL | relLangURL }}news/newsflash/#{{ dateFormat "2006-01-02" .date }}:{{ $newsDayCounter }}">
       {{ if .title }}
         {{ $title := replaceRE "<a .*\">" "" .title }}
         {{ $title = replaceRE "</a>" "" $title }}
         {{ $title | safeHTML }}
       {{ else }}
         {{ $description := replaceRE "<a .*\">" "" .description }}
         {{ $description = replaceRE "</a>" "" $description }}
         {{ $description | safeHTML }}
       {{ end }}
       </a>
     </p>
+      {{ $newsCounter = add $newsCounter 1 }}
+      {{ $newsDayPrev = $newsDayCur }}
     {{ end }}
-    {{ $newsCounter = add $newsCounter 1 }}
   {{ end }}
 {{ end }}