diff --git a/nvim/.config/nvim/lua/plugins/completion.lua b/nvim/.config/nvim/lua/plugins/completion.lua
index 4c75211..ba17644 100644
--- a/nvim/.config/nvim/lua/plugins/completion.lua
+++ b/nvim/.config/nvim/lua/plugins/completion.lua
@@ -260,9 +260,28 @@ local latex_cmp = {
 	end,
 }
 
+local markdown_cmp = {}
+-- FIXME: Currently always set to true but should ideally
+-- recognize if we have render-markdown available or not
+if is_available("render-markdown") or true then
+	markdown_cmp = {
+		"nvim-cmp",
+		dependencies = {
+			{ "MeanderingProgrammer/render-markdown.nvim", main = "render-markdown", optional = true },
+		},
+		ft = "markdown",
+		opts = function(_, opts)
+			table.insert(opts.sources, {
+				name = "render-markdown",
+			})
+		end,
+	}
+end
+
 return {
 	completion_engine,
 	snippet_engine,
 	beancount_cmp,
 	latex_cmp,
+	markdown_cmp,
 }