diff --git a/libraries/views.py b/libraries/views.py
index 330eed67..3a0a62ef 100644
--- a/libraries/views.py
+++ b/libraries/views.py
@@ -14,7 +14,7 @@ class LibraryList(CategoryMixin, ListView):
     """List all of our libraries by name"""
 
     paginate_by = 25
-    queryset = Library.objects.prefetch_related("categories").all().order_by("name")
+    queryset = Library.objects.prefetch_related("authors", "categories").all().order_by("name")
     template_name = "libraries/list.html"
 
 
diff --git a/templates/libraries/detail.html b/templates/libraries/detail.html
index a586eaa7..e97633ae 100644
--- a/templates/libraries/detail.html
+++ b/templates/libraries/detail.html
@@ -81,15 +81,17 @@
           <div class="py-6">
             <h3 class="text-2xl mb-4">Authors</h3>
             <div class="space-y-3">
-              <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline mr-5" /> Glen Fernandes</div>
-              <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline mr-5" /> Glen Fernandes</div>
+              {% for author in object.authors.all %}
+                <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline mr-5" /> {{ author.get_full_name }}</div>
+              {% endfor %}
             </div>
           </div>
           <div class="py-6">
             <h3 class="text-2xl mb-4">Maintainers</h3>
             <div class="space-y-3">
-              <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline mr-5" /> Glen Fernandes</div>
-              <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline mr-5" /> Glen Fernandes</div>
+              {% for maintainer in object.maintainers.all %}
+                <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline mr-5" /> {{ maintainer.get_full_name }}</div>
+              {% endfor %}
             </div>
           </div>
         </div>
diff --git a/templates/libraries/list.html b/templates/libraries/list.html
index f3e06f4f..3e9ced8b 100644
--- a/templates/libraries/list.html
+++ b/templates/libraries/list.html
@@ -73,11 +73,13 @@
       <div class="md:w-1/4 mb-4 text-sm">
         <div class="my-5 flex">
           <div class="md:mr-5 w-1/3">Author(s):</div>
-          <div class="space-y-3">
-            <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline" /> Glen Fernandes</div>
-            <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline" /> Glen Fernandes</div>
-            <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline" /> Glen Fernandes</div>
-          </div>
+          {% if library.authors.count %}
+            <div class="space-y-3">
+              {% for author in library.authors.all %}
+                <div><img src="{% static 'img/fpo/user.png' %}" alt="user" class="inline" /> {{ author.get_full_name }}</div>
+              {% endfor %}
+            </div>
+          {% endif %}
         </div>
       </div>
     </div>