diff --git a/.dir-locals.el b/.dir-locals.el
index 05d260fb8..899ba7591 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -8,8 +8,9 @@
   (sentence-end-double-space . t))
  (org-mode
   (indent-tabs-mode)
-  (org-edit-src-content-indentation . 2)
-  (org-adapt-indentation)))
+  (org-edit-src-content-indentation . 0)
+  (org-adapt-indentation)
+  (org-list-description-max-indent . 5)))
 
 
 
diff --git a/lisp/org-list.el b/lisp/org-list.el
index c004a72ac..c61634cf7 100644
--- a/lisp/org-list.el
+++ b/lisp/org-list.el
@@ -338,7 +338,8 @@ with the word \"recursive\" in the value."
 When the indentation would be larger than this, it will become
 5 characters instead."
   :group 'org-plain-lists
-  :type 'integer)
+  :type 'integer
+  :safe #'wholenump)
 
 (defcustom org-list-indent-offset 0
   "Additional indentation for sub-items in a list.