diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0ea016..80ea389 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - BibTeX parser: Fix hyphen in family name.
 - Fix a bug in EDTF parsing.
 - Bib2csl: Fix a sentence case conversion bug that words after colons are not capitalized.
+- Bib2csl: Map `shorthand` to `citation-label`.
 
 ## [0.5.1] - 2024-07-10
 
diff --git a/citeproc/citeproc-bibtex-data.lua b/citeproc/citeproc-bibtex-data.lua
index 541bacc..3294e78 100644
--- a/citeproc/citeproc-bibtex-data.lua
+++ b/citeproc/citeproc-bibtex-data.lua
@@ -478,6 +478,7 @@ return {
     },
     legmaterial = {
       csl = "legislation",
+      notes = "APA §11.6: Legislative materials include federal testimony, hearings, bills, resolutions, reports, and related documents.",
       source = "apa.dbx",
     },
     letter = {
@@ -3424,8 +3425,8 @@ return {
       type = "literal",
     },
     shorthand = {
-      csl = nil,
-      notes = "Not supported.",
+      csl = "citation-label",
+      notes = "A special designation to be used by the citation style instead of the usual label.",
       source = "biblatex",
       type = "literal",
     },
diff --git a/scripts/bib-csl-mapping.md b/scripts/bib-csl-mapping.md
index 127aaf1..a25c3c7 100644
--- a/scripts/bib-csl-mapping.md
+++ b/scripts/bib-csl-mapping.md
@@ -162,7 +162,7 @@ Bib(La)TeX | CSL | Notes
 `series` | `collection-title` |
 `shortauthor` | - |
 `shorteditor` | - |
-`shorthand` | - | Not supported.
+`shorthand` | `citation-label` | A special designation to be used by the citation style instead of the usual label.
 `shorthandintro` | - | Not supported.
 `shortjournal` | `container-title-short` |
 `shortseries` | - |
diff --git a/scripts/citeproc-bibtex-data.json b/scripts/citeproc-bibtex-data.json
index 3673d27..875a935b 100644
--- a/scripts/citeproc-bibtex-data.json
+++ b/scripts/citeproc-bibtex-data.json
@@ -2609,8 +2609,8 @@
             "type": "literal"
         },
         "shorthand": {
-            "csl": null,
-            "notes": "Not supported.",
+            "csl": "citation-label",
+            "notes": "A special designation to be used by the citation style instead of the usual label.",
             "source": "biblatex",
             "type": "literal"
         },
diff --git a/tests/bibtex/biblatex-examples.json b/tests/bibtex/biblatex-examples.json
index 2cc6a0e..00d0b8c 100644
--- a/tests/bibtex/biblatex-examples.json
+++ b/tests/bibtex/biblatex-examples.json
@@ -1957,6 +1957,7 @@
 				"given": "Immanuel"
 			}
 		],
+		"citation-label": "KpV",
 		"container-author": [
 			{
 				"family": "Kant",
@@ -1990,6 +1991,7 @@
 				"given": "Immanuel"
 			}
 		],
+		"citation-label": "KU",
 		"container-author": [
 			{
 				"family": "Kant",