diff --git a/NEWS.md b/NEWS.md
index 72882791..05a1ddce 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -2,6 +2,12 @@
 
 ## 11.x
 
+- **Neovim >= 0.10** now uses the much faster [lazydev.nvim](https://github.com/folke/lazydev.nvim)
+  instead of `neodev.nvim`
+
+- moved `neoconf.nvim` to extras. Project specific LSP settings
+  can be done with a `.lazy.lua` file instead.
+
 - `mini.ai` is back as a default plugin! Removing it was a mistake.
   It's a great plugin that enhances the native text objects.
 
diff --git a/lua/lazyvim/plugins/coding.lua b/lua/lazyvim/plugins/coding.lua
index a3c91c3d..1f2cd7ae 100644
--- a/lua/lazyvim/plugins/coding.lua
+++ b/lua/lazyvim/plugins/coding.lua
@@ -200,4 +200,26 @@ return {
       }
     end,
   },
+
+  {
+    "folke/lazydev.nvim",
+    ft = "lua",
+    opts = function()
+      return {
+        library = {
+          uv = LazyVim.get_plugin_path("luvit-meta", "library"),
+          lazyvim = LazyVim.get_plugin_path("LazyVim"),
+        },
+      }
+    end,
+  },
+  -- Manage libuv types with lazy. Plugin will never be loaded
+  { "Bilal2453/luvit-meta", lazy = true },
+  -- Add lazydev source to cmp
+  {
+    "hrsh7th/nvim-cmp",
+    opts = function(_, opts)
+      table.insert(opts.sources, { name = "lazydev", group_index = 0 })
+    end,
+  },
 }
diff --git a/lua/lazyvim/plugins/compat/nvim-0_9.lua b/lua/lazyvim/plugins/compat/nvim-0_9.lua
index 2962c97c..36394a72 100644
--- a/lua/lazyvim/plugins/compat/nvim-0_9.lua
+++ b/lua/lazyvim/plugins/compat/nvim-0_9.lua
@@ -1,8 +1,18 @@
+-- Compatibility with Neovim 0.9
 return {
+  -- Use LuaSnip instead of native snippets
   { import = "lazyvim.plugins.extras.coding.luasnip" },
-  {
-    "folke/ts-comments.nvim",
-    enabled = false,
-  },
+
+  -- Use mini.comment instead of ts-comments
+  { "folke/ts-comments.nvim", enabled = false },
   { import = "lazyvim.plugins.extras.coding.mini-comment" },
+
+  -- Use neodev instead of lazydev
+  { "folke/lazydev.nvim", enabled = false },
+  {
+    "neovim/nvim-lspconfig",
+    dependencies = {
+      { "folke/neodev.nvim", opts = {} },
+    },
+  },
 }
diff --git a/lua/lazyvim/plugins/lsp/init.lua b/lua/lazyvim/plugins/lsp/init.lua
index 7e871a99..1df5f728 100644
--- a/lua/lazyvim/plugins/lsp/init.lua
+++ b/lua/lazyvim/plugins/lsp/init.lua
@@ -4,7 +4,6 @@ return {
     "neovim/nvim-lspconfig",
     event = "LazyFile",
     dependencies = {
-      { "folke/neodev.nvim", opts = {} },
       "mason.nvim",
       "williamboman/mason-lspconfig.nvim",
     },