diff --git a/R/handlers-langfeatures.R b/R/handlers-langfeatures.R
index eba577db..a66a1a81 100644
--- a/R/handlers-langfeatures.R
+++ b/R/handlers-langfeatures.R
@@ -101,7 +101,9 @@ text_document_document_highlight  <- function(self, id, params) {
 text_document_document_symbol  <- function(self, id, params) {
     textDocument <- params$textDocument
     uri <- textDocument$uri
-    self$deliver(document_symbol_reply(id, uri, self$workspace))
+    document <- self$documents[[uri]]
+    self$deliver(document_symbol_reply(id, uri, self$workspace, document,
+        self$ClientCapabilities$textDocument$documentSymbol))
 }
 
 #' `textDocument/codeAction` request handler
diff --git a/R/symbol.R b/R/symbol.R
index a0ff340d..7ff2ea9b 100644
--- a/R/symbol.R
+++ b/R/symbol.R
@@ -31,18 +31,73 @@ SymbolKind <- list(
 
 #' Get all the symbols in the document
 #' @keywords internal
-document_symbol_reply <- function(id, uri, workspace) {
+document_symbol_reply <- function(id, uri, workspace, document, capabilities) {
     defns <- workspace$get_definitions_for_uri(uri)
-    logger$info("document symbols found: ", length(defns))
-    result <- lapply(names(defns),
+    logger$info("document definitions found: ", length(defns))
+    definition_symbols <- lapply(names(defns),
         function(funct) {
             symbol_information(
                 name = funct,
-                kind = SymbolKind[["Function"]],
+                kind = SymbolKind$Function,
                 location = defns[[funct]]
             )
     })
-    if (is.null(result)) {
+    result <- definition_symbols
+
+    if (isTRUE(capabilities$hierarchicalDocumentSymbolSupport)) {
+        section_symbols <- NULL
+        section_lines <- seq_len(document$nline)
+        section_lines <- section_lines[
+            grep("^\\#+\\s*(.+)\\s*(\\#{4,}|\\+{4,}|\\-{4,}|\\={4,})\\s*$",
+                document$content[section_lines])]
+        logger$info("document sections found: ", length(section_lines))
+        if (length(section_lines)) {
+            section_names <- trimws(gsub("^\\#+\\s*(.+)\\s*(\\#{4,}|\\+{4,}|\\-{4,}|\\={4,})\\s*$",
+                "\\1", document$content[section_lines]))
+            section_end_lines <- c(section_lines[-1] - 1, document$nline)
+            section_symbols <- .mapply(function(name, start_line, end_line) {
+                symbol_information(
+                    name = name,
+                    kind = SymbolKind$String,
+                    location = list(
+                        uri = uri,
+                        range = range(
+                            start = document$to_lsp_position(row = start_line - 1, col = 0),
+                            end = document$to_lsp_position(row = end_line - 1, col = nchar(document$line(end_line)))
+                        )
+                    )
+                )
+            }, list(section_names, section_lines, section_end_lines), NULL)
+            result <- c(result, section_symbols)
+        }
+
+        subsection_symbols <- NULL
+        subsection_lines <- seq_len(document$nline)
+        subsection_lines <- subsection_lines[
+            grep("^\\s+\\#+\\s*(.+)\\s*(\\#{4,}|\\+{4,}|\\-{4,}|\\={4,})\\s*$",
+                document$content[subsection_lines])]
+        logger$info("document subsections found: ", length(subsection_lines))
+        if (length(subsection_lines)) {
+            subsection_names <- trimws(gsub("^\\s+\\#+\\s*(.+)\\s*(\\#{4,}|\\+{4,}|\\-{4,}|\\={4,})\\s*$",
+                "\\1", document$content[subsection_lines]))
+            subsection_symbols <- .mapply(function(name, line) {
+                symbol_information(
+                    name = name,
+                    kind = SymbolKind$String,
+                    location = list(
+                        uri = uri,
+                        range = range(
+                            start = document$to_lsp_position(row = line - 1, col = 0),
+                            end = document$to_lsp_position(row = line - 1, col = nchar(document$line(line)))
+                        )
+                    )
+                )
+            }, list(subsection_names, subsection_lines), NULL)
+            result <- c(result, subsection_symbols)
+        }
+    }
+
+    if (length(result) == 0) {
         Response$new(id)
     } else {
         Response$new(