diff --git a/lisp/ob-tangle.el b/lisp/ob-tangle.el
index eb3760048..f07a3b88c 100644
--- a/lisp/ob-tangle.el
+++ b/lisp/ob-tangle.el
@@ -287,13 +287,15 @@ code blocks by language."
 					      current-heading block-counter))))
 	     (src-lang (nth 0 info))
 	     (expand-cmd (intern (concat "org-babel-expand-body:" src-lang)))
+	     (assignments-cmd (intern (concat "org-babel-variable-assignments:" src-lang)))
 	     (body ((lambda (body)
 		      (if (assoc :no-expand params)
 			  body
-			(funcall (if (fboundp expand-cmd)
-				     expand-cmd
-				   'org-babel-expand-body:generic)
-				 body params)))
+			(if (fboundp expand-cmd) (funcall expand-cmd body params)
+			  (org-babel-expand-body:generic
+			   body params
+			   (and (fboundp assignments-cmd)
+				(funcall assignments-cmd params))))))
 		    (if (and (cdr (assoc :noweb params))
 			     (let ((nowebs (split-string
 					    (cdr (assoc :noweb params)))))