diff --git a/assets/css/custom.css b/assets/css/custom.css
index 9b0a7ed..33281b7 100644
--- a/assets/css/custom.css
+++ b/assets/css/custom.css
@@ -253,6 +253,8 @@ a:hover {
 }
 .journal-section { color: var(--accent); font-weight: 500; }
 .journal-date { font-variant-numeric: tabular-nums; }
+.journal-author { color: var(--color-text-primary); font-weight: 500; }
+.journal-author::before { content: "von "; color: var(--color-text-muted); font-weight: 400; }
 
 .journal-title {
   font-family: var(--font-family-display);
@@ -434,12 +436,25 @@ a:hover {
   line-height: 1.15;
   margin: 0 0 var(--spacing-xs);
 }
+.single-byline {
+  font-family: var(--font-family-mono);
+  font-size: 0.85rem;
+  color: var(--color-text-muted);
+  margin: 0 0 var(--spacing-xs);
+  display: flex;
+  flex-wrap: wrap;
+  gap: 0.6rem;
+  align-items: baseline;
+}
+.byline-author { color: var(--color-text-primary); font-weight: 500; }
+.byline-date { font-variant-numeric: tabular-nums; }
+
 .single-summary {
   font-family: var(--font-family-serif);
   font-style: italic;
   font-size: 1.02rem;
   line-height: 1.45;
-  margin: 0;
+  margin: var(--spacing-xs) 0 0;
   max-width: 55ch;
 }
 .single-content h2 {
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index 0b5402e..d21bd77 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -4,6 +4,14 @@
   <article class="single">
     <header class="single-header">
       <h1>{{ .Title }}</h1>
+      {{ $author := .Params.author | default site.Params.author.name }}
+      {{ if or $author .Date }}
+        <p class="single-byline">
+          {{ with $author }}<span class="byline-author">von {{ . }}</span>{{ end }}
+          {{ if and $author .Date }} · {{ end }}
+          {{ if .Date }}<time class="byline-date" datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "2006-01-02" }}</time>{{ end }}
+        </p>
+      {{ end }}
       {{ with .Params.summary }}
         <p class="single-summary text-muted">{{ . }}</p>
       {{ end }}
@@ -23,19 +31,15 @@
       {{ .Content }}
     </div>
 
-    <div class="time">
-      {{ partial "date.html" .Date }}
-      {{ $showReadingTime := .Params.showreadingtime | default site.Params.showreadingtime | default true }}
-      {{ if and $showReadingTime .ReadingTime }}
-        <span class="reading-time"> · {{ .ReadingTime }} min Lesezeit</span>
-      {{ end }}
-      {{ $showLastMod := .Params.showlastmod | default site.Params.showlastmod | default false }}
-      {{ if and $showLastMod .Lastmod }}
-        {{ if ne (.Lastmod.Format "2006-01-02") (.Date.Format "2006-01-02") }}
-          <span class="lastmod"> · Zuletzt aktualisiert: {{ .Lastmod.Format "2006-01-02" }}</span>
-        {{ end }}
-      {{ end }}
-    </div>
+    {{ $showReadingTime := .Params.showreadingtime | default site.Params.showreadingtime | default true }}
+    {{ $showLastMod := .Params.showlastmod | default site.Params.showlastmod | default false }}
+    {{ $hasLastmod := and $showLastMod .Lastmod (ne (.Lastmod.Format "2006-01-02") (.Date.Format "2006-01-02")) }}
+    {{ if or (and $showReadingTime .ReadingTime) $hasLastmod }}
+      <div class="time">
+        {{ if and $showReadingTime .ReadingTime }}<span class="reading-time">{{ .ReadingTime }} min Lesezeit</span>{{ end }}
+        {{ if $hasLastmod }}{{ if and $showReadingTime .ReadingTime }} · {{ end }}<span class="lastmod">Zuletzt aktualisiert: {{ .Lastmod.Format "2006-01-02" }}</span>{{ end }}
+      </div>
+    {{ end }}
   </article>
 
 {{ end }}
diff --git a/layouts/index.html b/layouts/index.html
index 72d725a..3a5559f 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -13,12 +13,14 @@
     <ol class="journal-list">
       {{ range $journal }}
         <li class="journal-entry">
+          {{ $author := .Params.author | default site.Params.author.name }}
           <a class="journal-entry-link" href="{{ .RelPermalink }}">
             <div class="journal-meta">
               {{ with .Parent }}
                 <span class="journal-section">{{ .Title }}</span>
               {{ end }}
               <time class="journal-date" datetime="{{ .Date.Format "2006-01-02" }}">{{ .Date.Format "2006-01-02" }}</time>
+              {{ with $author }}<span class="journal-author">{{ . }}</span>{{ end }}
             </div>
             <h3 class="journal-title">{{ .LinkTitle }}</h3>
             {{ with .Params.summary }}