diff --git a/mercurial/templates/json/map b/mercurial/templates/json/map
--- a/mercurial/templates/json/map
+++ b/mercurial/templates/json/map
@@ -14,7 +14,15 @@ tagentry = '\{
   "node": {node|json},
   "date": {date|json}
   }'
-bookmarks = '"not yet implemented"'
+bookmarks = '\{
+  "node": {node|json},
+  "bookmarks": [{join(entries%bookmarkentry, ", ")}]
+  }'
+bookmarkentry = '\{
+  "bookmark": {bookmark|json},
+  "node": {node|json},
+  "date": {date|json}
+  }'
 branches = '"not yet implemented"'
 summary = '"not yet implemented"'
 filediff = '"not yet implemented"'
diff --git a/tests/test-hgweb-json.t b/tests/test-hgweb-json.t
--- a/tests/test-hgweb-json.t
+++ b/tests/test-hgweb-json.t
@@ -191,7 +191,27 @@ bookmarks/ shows bookmarks info
   $ request json-bookmarks
   200 Script output follows
   
-  "not yet implemented"
+  {
+    "bookmarks": [
+      {
+        "bookmark": "bookmark1",
+        "date": [
+          0.0,
+          0
+        ],
+        "node": "8d7c456572acf3557e8ed8a07286b10c408bcec5"
+      },
+      {
+        "bookmark": "bookmark2",
+        "date": [
+          0.0,
+          0
+        ],
+        "node": "ceed296fe500c3fac9541e31dad860cb49c89e45"
+      }
+    ],
+    "node": "6ab967a8ab3489227a83f80e920faa039a71819f"
+  }
 
 branches/ shows branches info