diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 2b418cd3c..e61bd6988 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -516,7 +516,9 @@ and returns an appropriate timestamp string.
 
 ~org-element-timestamp-parser~ now adds =:repeater-deadline-value= and
 =:repeater-deadline-unit= properties to each timestamp object that has
-a repeater deadline.
+a repeater deadline.  For example, in =<2012-03-29 Thu ++1y/2y>=, =2y=
+is the repeater deadline with a value of =2= and unit of =y=.  See
+"5.3.3 Tracking your habits" section in the manual.
 
 Possible values for =:repeater-deadline-value=: ~positive integer~, ~nil~.
 
diff --git a/lisp/org-element.el b/lisp/org-element.el
index 49a312694..e7561f16f 100644
--- a/lisp/org-element.el
+++ b/lisp/org-element.el
@@ -4331,13 +4331,13 @@ (defun org-element-timestamp-parser ()
               (and (not diaryp)
                    (string-match
                     (rx
-                     (group (or "+" "++" ".+"))
-                     (group (+ digit))
-                     (group (or "h" "d" "w" "m" "y"))
-                     (\?
+                     (group-n 1 (or "+" "++" ".+"))
+                     (group-n 2 (+ digit))
+                     (group-n 3 (any "hdwmy"))
+                     (optional
                       "/"
-                      (group (+ digit))
-                      (group (or "h" "d" "w" "m" "y"))))
+                      (group-n 4 (+ digit))
+                      (group-n 5 (any "hdwmy"))))
                     raw-value)
                    (nconc
                     (list
@@ -4427,17 +4427,15 @@ (defun org-element-timestamp-interpreter (timestamp _)
 	               (and val (number-to-string val)))
 	             (pcase (org-element-property :repeater-unit timestamp)
 	               (`hour "h") (`day "d") (`week "w") (`month "m") (`year "y"))
-                     (let ((repeater-deadline-value
-                            (org-element-property :repeater-deadline-value timestamp))
-                           (repeater-deadline-unit
-                            (org-element-property :repeater-deadline-unit timestamp)))
-                       (if (and repeater-deadline-value repeater-deadline-unit)
-                           (concat
-                            "/"
-                            (number-to-string repeater-deadline-value)
-                            (pcase repeater-deadline-unit
-                              (`hour "h") (`day "d") (`week "w") (`month "m") (`year "y")))
-                         ""))))
+                     (when-let ((repeater-deadline-value
+                                 (org-element-property :repeater-deadline-value timestamp))
+                                (repeater-deadline-unit
+                                 (org-element-property :repeater-deadline-unit timestamp)))
+                       (concat
+                        "/"
+                        (number-to-string repeater-deadline-value)
+                        (pcase repeater-deadline-unit
+                          (`hour "h") (`day "d") (`week "w") (`month "m") (`year "y"))))))
                    (range-type (org-element-property :range-type timestamp))
                    (warning-string
 	            (concat