diff --git a/lisp/ol.el b/lisp/ol.el
index 452ed95bc..0cb1b0a7e 100644
--- a/lisp/ol.el
+++ b/lisp/ol.el
@@ -460,7 +460,7 @@ This is for example useful to limit the length of the subject.
 
 Examples: \"%f on: %.30s\", \"Email from %f\", \"Email %c\""
   :group 'org-link-store
-  :package-version '(Org . 9.3)
+  :package-version '(Org . "9.3")
   :type 'string
   :safe #'stringp)
 
diff --git a/lisp/org-src.el b/lisp/org-src.el
index 5a17f51bb..c9eef744e 100644
--- a/lisp/org-src.el
+++ b/lisp/org-src.el
@@ -241,8 +241,7 @@ green, respectability.
   "If non-nil, the effect of TAB in a code block is as if it were
 issued in the language major mode buffer."
   :type 'boolean
-  :version "27.1"
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :group 'org-babel)
 
 
diff --git a/lisp/org-table.el b/lisp/org-table.el
index 48386244a..e9f15dbea 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -169,7 +169,7 @@ table, obtained by prompting the user."
 (defcustom org-table-header-line-p nil
   "Activate `org-table-header-line-mode' by default?"
   :type 'boolean
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :group 'org-table)
 
 (defcustom org-table-default-size "5x2"
diff --git a/lisp/org.el b/lisp/org.el
index e82463046..5af4f8c05 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -919,8 +919,7 @@ equivalent option for agenda views."
 		 (const :tag "All headlines in active region" t)
 		 (const :tag "In active region, headlines at the same level than the first one" start-level)
 		 (string :tag "Tags/Property/Todo matcher"))
-  :version "27.1"
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :group 'org-todo
   :group 'org-archive)
 
@@ -3592,8 +3591,7 @@ Normally, only the TODO/DONE keyword indicates the state of a headline.
 When this is non-nil, the headline after the keyword is set to the
 `org-headline-done' as an additional indication."
   :group 'org-appearance
-  :version "27.1"
-  :package-version "9.4"
+  :package-version '(Org . "9.4")
   :type 'boolean)
 
 (defcustom org-fontify-emphasized-text t