diff --git a/rockstar/rockstar.css b/rockstar/rockstar.css
index 90ab4c9a..d15d2034 100644
--- a/rockstar/rockstar.css
+++ b/rockstar/rockstar.css
@@ -27,4 +27,7 @@
 }
 .hoverDiv:hover {
     background-color: #f0f0f0;
-}
\ No newline at end of file
+}
+.rs_headerTable td {
+    padding: 8px;
+}
diff --git a/rockstar/rockstar.js b/rockstar/rockstar.js
index a4fb0d37..58dc8a17 100644
--- a/rockstar/rockstar.js
+++ b/rockstar/rockstar.js
@@ -979,14 +979,23 @@
                 }
                 requestJSON({url, method: method.value, data: data.value}).then((objects, status, jqXHR) => {
                     $(results).html("<br>");
-                    var linkHeader = jqXHR.getResponseHeader("Link"); // TODO: maybe show X-Rate-Limit-* headers, too.
+                    const linkHeader = jqXHR.getResponseHeader('Link');
+                    const remaining = jqXHR.getResponseHeader('X-Rate-Limit-Remaining');
+                    const limit = jqXHR.getResponseHeader('X-Rate-Limit-Limit');
+                    const reset = new Date(jqXHR.getResponseHeader('XX-Rate-Limit-Reset') * 1000);
                     if (linkHeader) {
-                        $(results).html("<br>Headers<br><table><tr><td>Link<td>" + linkHeader.replace(/</g, "&lt;").replace(/, /g, "<br>") + "</table><br>");
+                        link = '<tr><td>Link<td>' + linkHeader.replace(/</g, "&lt;").replace(/, /g, "<br>");
                         var links = getLinks(linkHeader);
                         if (links.next) {
                             var nextUrl = new URL(links.next); // links.next is an absolute URL; we need a relative URL.
                             nextUrl = nextUrl.pathname + nextUrl.search;
                         }
+                        if (remaining && limit && reset) {
+                            $(results).html('<br>Headers<br><table class="rs_headerTable">' + link + `<tr><td>Rate Limit<td> ${limit} <tr><td>Rate Limit Remaining<td> ${remaining} <tr><td>Rate Limit Reset<td> ${reset}` + '</table><br>');
+                        }
+                        else {
+                            $(results).html('<br>Headers<br><table class="rs_headerTable">' + link + '</table><br>');
+                        }
                     }
                     $(results).append("Status: " + jqXHR.status + " " + jqXHR.statusText + "<br>");
                     if (objects) {