diff --git a/CHANGELOG.md b/CHANGELOG.md
index 375fe43..3ab6253 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 Note: Breaking changes between versions are indicated by "💥".
 
+## Unreleased
+
+- [Feature] Add SCORM XBlock to default openedx docker image
+
 ## v3.11.12 (2020-04-16)
 
 - [Feature] Make it easy to add custom translation strings to the openedx Docker image
diff --git a/README.rst b/README.rst
index 1bdf266..83b21af 100644
--- a/README.rst
+++ b/README.rst
@@ -35,17 +35,18 @@ Tutor: the docker-based Open edX distribution designed for peace of mind
 
 **Tutor** is a docker-based `Open edX <https://openedx.org>`_ distribution, both for production and local development. The goal of Tutor is to make it easy to deploy, customize, upgrade and scale Open edX. Tutor is reliable, fast, extensible, and it is already used by dozens of Open edX platforms around the world.
 
-Do you need professional assistance setting up or managing your Open edX platform? Overhang.IO offers online support as part of its `Long Term Support (LTS) offering <https://overhang.io/tutor/lts>`__.
+Do you need professional assistance setting up or managing your Open edX platform? Overhang.IO provides online support as part of its `Long Term Support (LTS) offering <https://overhang.io/tutor/lts>`__.
 
 Features
 --------
 
 * 100% `open source <https://github.com/overhangio/tutor>`__
 * Runs entirely on Docker
-* World-famous 1-click `installation and upgrades <https://docs.tutor.overhang.io/install.html>`_
-* Extensible architecture with `plugins <https://docs.tutor.overhang.io/plugins.html>`_
-* Works with `Kubernetes <https://docs.tutor.overhang.io/k8s.html>`_
-* No technical skill required with the `1-click Tutor AWS image <https://docs.tutor.overhang.io/install.html#cloud-deployment>`_
+* World-famous 1-click `installation and upgrades <https://docs.tutor.overhang.io/install.html>`__
+* Comes with batteries included: `theming <https://github.com/overhangio/indigo>`__, `SCORM <https://github.com/overhangio/openedx-scorm-xblock>`__, `HTTPS <https://docs.tutor.overhang.io/configuration.html#ssl-tls-certificates-for-https-access>`__, `web-based administration interface <https://docs.tutor.overhang.io/extra.html#web-ui>`__, `mobile app <https://docs.tutor.overhang.io/extra.html#mobile-android-application>`__, `custom translations <https://docs.tutor.overhang.io/configuration.html#adding-custom-translations>`__...
+* Extensible architecture with `plugins <https://docs.tutor.overhang.io/plugins.html>`__
+* Works with `Kubernetes <https://docs.tutor.overhang.io/k8s.html>`__
+* No technical skill required with the `1-click Tutor AWS image <https://docs.tutor.overhang.io/install.html#cloud-deployment>`__
 * Professional support and premium plugins available with `Tutor Long Term Support (LTS) <https://overhang.io/tutor/lts>`__
 
 .. _readme_intro_end:
diff --git a/docs/configuration.rst b/docs/configuration.rst
index 9e3ddd0..99b3681 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -267,6 +267,8 @@ You may want to run your own flavor of edx-platform instead of the `official ver
 
 Note that your release must be a fork of Ironwood in order to work. Otherwise, you may have important compatibility issues with other services. In particular, **don't try to run Tutor with older versions of Open edX**.
 
+.. _i18n:
+
 Adding custom translations
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/tutor/templates/apps/openedx/settings/partials/common_all.py b/tutor/templates/apps/openedx/settings/partials/common_all.py
index 5594fa2..1c3bf9d 100644
--- a/tutor/templates/apps/openedx/settings/partials/common_all.py
+++ b/tutor/templates/apps/openedx/settings/partials/common_all.py
@@ -48,5 +48,8 @@ EMAIL_FILE_PATH = "/tmp/openedx/emails"
 LOCALE_PATHS.append("/openedx/locale/contrib/locale")
 LOCALE_PATHS.append("/openedx/locale/user/locale")
 
+# Allow the platform to include itself in an iframe
+X_FRAME_OPTIONS = "SAMEORIGIN"
+
 {{ patch("openedx-common-settings") }}
 ######## End of settings common to LMS and CMS
\ No newline at end of file
diff --git a/tutor/templates/build/openedx/Dockerfile b/tutor/templates/build/openedx/Dockerfile
index e4ab12c..322354a 100644
--- a/tutor/templates/build/openedx/Dockerfile
+++ b/tutor/templates/build/openedx/Dockerfile
@@ -59,6 +59,9 @@ RUN pip uninstall -y ora2 && \
 # Install patched version of edx-oauth2-provider
 RUN pip install git+https://github.com/overhangio/edx-oauth2-provider.git@1.2.3#egg=edx-oauth2-provider==1.2.3
 
+# Install ironwood-compatible scorm xblock
+RUN pip install "openedx-scorm-xblock<10.0.0,>=9.0.0"
+
 # Install a recent version of nodejs
 RUN nodeenv /openedx/nodeenv --node=8.9.3 --prebuilt
 ENV PATH /openedx/nodeenv/bin:${PATH}