diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 88444fef54e..dcd3208d132 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -1,5 +1,5 @@
 % Reference Card for Org Mode
-\def\orgversionnumber{9.8.2}
+\def\orgversionnumber{9.8.3}
 \def\versionyear{2026}          % latest update
 \input emacsver.tex
 
diff --git a/lisp/org/ob-tangle.el b/lisp/org/ob-tangle.el
index 9d4c914c27f..a21ab3f18aa 100644
--- a/lisp/org/ob-tangle.el
+++ b/lisp/org/ob-tangle.el
@@ -42,6 +42,7 @@
 (declare-function org-before-first-heading-p "org" ())
 (declare-function org-element-lineage "org-element-ast" (datum &optional types with-self))
 (declare-function org-element-begin "org-element" (node))
+(declare-function org-element-end "org-element" (node))
 (declare-function org-element-at-point "org-element" (&optional pom cached-only))
 (declare-function org-element-type-p "org-element-ast" (node types))
 (declare-function org-heading-components "org" ())
@@ -720,8 +721,12 @@ of the current buffer."
       (forward-line 1)
       ;; Try to preserve location of point within the source code in
       ;; tangled code file.
-      (let ((offset (- mid body-start)))
-	(when (> end (+ offset (point)))
+      (let ((offset (- mid body-start))
+            (block-ends-here (org-with-point-at (org-element-end (org-element-at-point))
+                               (skip-chars-backward " \t\n\r")
+                               (forward-line 0)
+                               (point))))
+        (when (> block-ends-here (+ offset (point)))
 	  (forward-char offset)))
       (setq target-char (point)))
     (org-src-switch-to-buffer target-buffer t)
diff --git a/lisp/org/org-version.el b/lisp/org/org-version.el
index 75d036844d8..b6a6d1d4eec 100644
--- a/lisp/org/org-version.el
+++ b/lisp/org/org-version.el
@@ -5,13 +5,13 @@
 (defun org-release ()
   "The release version of Org.
 Inserted by installing Org mode or when a release is made."
-   (let ((org-release "9.8.2"))
+   (let ((org-release "9.8.3"))
      org-release))
 ;;;###autoload
 (defun org-git-version ()
   "The Git version of Org mode.
 Inserted by installing Org or when a release is made."
-   (let ((org-git-version "release_9.8.2"))
+   (let ((org-git-version "release_9.8.3"))
      org-git-version))
 
 (provide 'org-version)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index bf3bfbc6244..84b4f245f8e 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -9,7 +9,7 @@
 ;; URL: https://orgmode.org
 ;; Package-Requires: ((emacs "28.2"))
 
-;; Version: 9.8.2
+;; Version: 9.8.3
 
 ;; This file is part of GNU Emacs.
 ;;
diff --git a/lisp/org/ox-html.el b/lisp/org/ox-html.el
index 6916cc21609..8e6f341565b 100644
--- a/lisp/org/ox-html.el
+++ b/lisp/org/ox-html.el
@@ -3103,7 +3103,8 @@ INFO is a plist containing export properties."
 	      (concat (file-name-as-directory org-preview-latex-image-directory)
 		      (file-name-sans-extension
 		       (file-name-nondirectory bfn)))
-	      cache-dir (file-name-directory (plist-get info :output-file)))
+	      cache-dir (file-name-directory
+                         (or (plist-get info :output-file) bfn)))
 	;; Re-create LaTeX environment from original buffer in
 	;; temporary buffer so that dvipng/imagemagick can properly
 	;; turn the fragment into an image.