diff --git a/CHANGELOG.develop b/CHANGELOG.develop
index 7b214e9a4..763746acb 100644
--- a/CHANGELOG.develop
+++ b/CHANGELOG.develop
@@ -2043,6 +2043,7 @@ Other:
 - Added layer variable =sql-auto-indent= to toggle the use of =sql-indent= package
   (thanks to David Chen)
 - Added a code formatter for sql-mode (thanks to Seong Yong-ju)
+- Added connection between =org-mode= and =SQL layer= (thanks to Magnus Therning)
 **** Spell-checking
 - Added spell checking transient state (thanks to Francesc Elies Henar)
 - Update to flyspell-correct v0.5 (thanks to Boris Buliga)
diff --git a/layers/+lang/sql/packages.el b/layers/+lang/sql/packages.el
index ebbbadde8..180a5fb5c 100644
--- a/layers/+lang/sql/packages.el
+++ b/layers/+lang/sql/packages.el
@@ -12,6 +12,7 @@
 (setq sql-packages
       '(
         company
+        org
         sql
         ;; This mode is more up-to-date than the MELPA one.
         ;; Turns out that it is available in GNU ELPA but we cannot
@@ -167,3 +168,7 @@
   (spacemacs|add-company-backends
     :backends company-capf
     :modes sql-mode))
+
+(defun sql/pre-init-org ()
+  (spacemacs|use-package-add-hook org
+    :post-config (add-to-list 'org-babel-load-languages '(sql . t))))