diff --git a/website/themes/beastie/layouts/partials/press.html b/website/themes/beastie/layouts/partials/press.html
index ca0e3c1d16..6bca5eece6 100644
--- a/website/themes/beastie/layouts/partials/press.html
+++ b/website/themes/beastie/layouts/partials/press.html
@@ -1,29 +1,38 @@
 {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
 {{ $translatedPressEnabled := false }}
 {{ if and (fileExists $pressPath) (ne $.Language.Lang "ja") }}
   {{ $translatedPressEnabled = true }}
 {{ end }}
 
 {{ $pressData := "" }}
 {{ if $translatedPressEnabled -}}
   {{ $data := index .Site.Data $.Language.Lang }}
   {{ $pressData = $data.press }}
 {{ else }}
   {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
   {{ $pressData = $dataDefaultLanguage.press }}
 {{ end }}
 
 {{ with $pressData.press }}
   {{ $pressCounter := 0 }}
+  {{ $pressMonthCounter := 1 }}
+  {{ $pressMonthPrev := false }}
   {{ range (sort .press "date" "desc") }}
     {{ if lt $pressCounter 5 }}
+      {{ $pressMonthCur := dateFormat "2006-01" .date }}
+      {{ if eq $pressMonthCur $pressMonthPrev }}
+        {{ $pressMonthCounter = add $pressMonthCounter 1 }}
+      {{ else }}
+        {{ $pressMonthCounter = 1 }}
+      {{ end }}
     <p>
       <span class="txtdate">{{ dateFormat "2006-01" .date }}</span>
       <br />
-      <a href="{{ if $translatedPressEnabled }}{{ .Site.BaseURL | relLangURL }}{{ else }}{{ $.Site.BaseURL }}{{ end }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressCounter }}">{{ .name }}</a>
+      <a href="{{ if $translatedPressEnabled }}{{ .Site.BaseURL | relLangURL }}{{ else }}{{ $.Site.BaseURL }}{{ end }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}">{{ .name }}</a>
     </p>
+      {{ $pressCounter = add $pressCounter 1 }}
+      {{ $pressMonthPrev = $pressMonthCur }}
     {{ end }}
-    {{ $pressCounter = add $pressCounter 1 }}
   {{ end }}
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/list.html b/website/themes/beastie/layouts/press/list.html
index f34ae7e986..332c4de940 100644
--- a/website/themes/beastie/layouts/press/list.html
+++ b/website/themes/beastie/layouts/press/list.html
@@ -1,76 +1,83 @@
 {{ 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) }}press/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.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
-        {{ $pressCounter := 0 }}
+        {{ $pressMonthCounter := 1 }}
+        {{ $pressMonthPrev := 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 $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
+                      {{ $pressMonthCur := dateFormat "2006-01" .date }}
+                      {{ if eq $pressMonthCur $pressMonthPrev }}
+                        {{ $pressMonthCounter = add $pressMonthCounter 1 }}
+                      {{ else }}
+                        {{ $pressMonthCounter = 1 }}
+                      {{ end }}
                       <li>
                         <p>
-                          <a id="{{ dateFormat "2006-01" .date }}:{{ $pressCounter }}"></a>
+                          <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
-                      {{ $pressCounter = add $pressCounter 1 }}
+                      {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}
diff --git a/website/themes/beastie/layouts/press/press.rss.xml b/website/themes/beastie/layouts/press/press.rss.xml
index 98f0348c85..660c49652d 100644
--- a/website/themes/beastie/layouts/press/press.rss.xml
+++ b/website/themes/beastie/layouts/press/press.rss.xml
@@ -1,41 +1,50 @@
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
   <channel>
     <title>FreeBSD in the Press</title>
     <link>https://www.FreeBSD.org/press/</link>
     <description>Press Stories about FreeBSD</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 in the Press</title>
       <link>https://www.FreeBSD.org/press/</link>
     </image>
     <atom:link href="https://www.FreeBSD.org/press/feed.xml" rel="self" type="application/rss+xml"/>
+    {{ $pressMonthPrev := false }}
     {{ $data := index .Site.Data "en" }}
     {{ $pressData := $data.press }}
     {{ with $pressData.press }}
       {{ $pressCounter := 0 }}
-        {{ range (sort .press "date" "desc") }}
-          {{ if lt $pressCounter 10 }}
+      {{ $pressMonthCounter := 1 }}
+      {{ range (sort .press "date" "desc") }}
+        {{ if lt $pressCounter 10 }}
+          {{ $pressMonthCur := dateFormat "2006-01" .date }}
+          {{ if eq $pressMonthCur $pressMonthPrev }}
+            {{ $pressMonthCounter = add $pressMonthCounter 1 }}
+          {{ else }}
+            {{ $pressMonthCounter = 1 }}
+          {{ end }}
             <item>
-              {{ if .name }}
+            {{ if .name }}
                 <title>
                   {{ .name }}
                 </title>
-              {{ end }}
-              {{ if .description }}
+            {{ end }}
+            {{ if .description }}
                 <description>
                   {{ .description }}
                 </description>
-              {{ end }}
-              <link>{{ absLangURL ($.Site.BaseURL) }}press/{{ dateFormat "2006-01" .date }}:{{ $pressCounter }}</link>
-              <guid>{{ absLangURL ($.Site.BaseURL) }}press/{{ dateFormat "2006-01" .date }}:{{ $pressCounter }}</guid>
+            {{ end }}
+              <link>{{ absLangURL ($.Site.BaseURL) }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}</link>
+              <guid>{{ absLangURL ($.Site.BaseURL) }}press/#{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}</guid>
               <pubDate>{{ dateFormat "2006-01-02" .date }}</pubDate>
             </item>
-          {{ end }}
+          {{ $pressMonthPrev = $pressMonthCur }}
+        {{ end }}
         {{ $pressCounter = add $pressCounter 1 }}
       {{ end }}
     {{ end }}
   </channel>
 </rss>
diff --git a/website/themes/beastie/layouts/press/single.html b/website/themes/beastie/layouts/press/single.html
index f34ae7e986..332c4de940 100644
--- a/website/themes/beastie/layouts/press/single.html
+++ b/website/themes/beastie/layouts/press/single.html
@@ -1,76 +1,83 @@
 {{ 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) }}press/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.loadPress }}
         {{ $pressPath := (printf "data/%s/press/press.toml" $.Language.Lang) }}
 
         {{ $pressData := "" }}
         {{ if (fileExists $pressPath) -}}
           {{ $data := index .Site.Data $.Language.Lang }}
           {{ $pressData = $data.press }}
         {{ else }}
           {{ $dataDefaultLanguage := index .Site.Data .Sites.First.Language.Lang }}
           {{ $pressData = $dataDefaultLanguage.press }}
         {{ end }}
 
         <!-- First load all year-month to the array -->
         {{ $yearsMonths := slice }}
         {{ with $pressData.press }}
           {{ range (sort .press "date" "desc") }}
             {{ $yearsMonths = $yearsMonths | append (dateFormat "2006-1" .date) }}
           {{ end }}
         {{ end }}
 
         <!-- Remove duplicates -->
         {{ $yearsMonths = $yearsMonths | uniq }}
 
-        {{ $pressCounter := 0 }}
+        {{ $pressMonthCounter := 1 }}
+        {{ $pressMonthPrev := 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 $pressData.press }}
                   {{ range (sort .press "date" "desc") }}
                     {{ if eq (dateFormat "2006-1" .date) $yearMonth }}
+                      {{ $pressMonthCur := dateFormat "2006-01" .date }}
+                      {{ if eq $pressMonthCur $pressMonthPrev }}
+                        {{ $pressMonthCounter = add $pressMonthCounter 1 }}
+                      {{ else }}
+                        {{ $pressMonthCounter = 1 }}
+                      {{ end }}
                       <li>
                         <p>
-                          <a id="{{ dateFormat "2006-01" .date }}:{{ $pressCounter }}"></a>
+                          <a id="{{ dateFormat "2006-01" .date }}:{{ $pressMonthCounter }}"></a>
                           <a href="{{ .url }}">
                             <strong>{{ .name }}</strong>
                           </a>
                           <br />
                           <a href="{{ .siteUrl }}">{{ .siteName }}</a>, {{ .author }}
                           <br />
                           {{ .description | safeHTML}}
                         </p>
                       </li>
-                      {{ $pressCounter = add $pressCounter 1 }}
+                      {{ $pressMonthPrev = $pressMonthCur }}
                     {{ end }}
                   {{ end }}
                 {{ end }}
               </ul>
             {{ end }}
           {{ end }}
         {{ end }}
       {{ end }}
     </div>
   </div>
 {{ end }}