diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ba12b7..08ce65e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
+## r2 - 2024-11-21
+
+### Added
+- Force line-buffering for 'tpm2-simulator' process, so that its text output will be visible.
+
 ## r1 - 2024-11-21
 
 - This is the first public release of this project.
diff --git a/Dockerfile b/Dockerfile
index 3d84bae..fb47bd9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -50,6 +50,9 @@ RUN install_packages \
 # Copy the built binaries
 COPY --from=build /opt/mssim/bin/tpm2-simulator /usr/bin/
 
+# Copy startup script
+COPY bin/entrypoint.sh /opt/
+
 # Start TPM simulator
-ENTRYPOINT ["/usr/bin/tpm2-simulator"]
+ENTRYPOINT ["/opt/entrypoint.sh"]
 CMD ["2321"]
diff --git a/README.md b/README.md
index b5f9252..5c6067b 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,6 @@ The purpose of this repository is to provide ready to use Docker images of [ms-t
 Version history
 ---------------
 
-| **Release** | **Date**   | **Base system**       | **TPM Simulator Version** | **Commit**                                                                       |
-| ------------| ---------- | --------------------- | ------------------------- |--------------------------------------------------------------------------------- |
-| r1          | 2024-11-21 | Debian 12, 2024-11-11 | 1.62.0                    | [`ee21db0a941d`](https://github.com/microsoft/ms-tpm-20-ref/commit/ee21db0a941d) |
+| **Release** | **Date**   | **Base system**       | **TPM Simulator Version** | **Commit**                                                                                    |
+| ------------| ---------- | --------------------- | ------------------------- |---------------------------------------------------------------------------------------------- |
+| r2          | 2024-11-21 | Debian 12, 2024-11-11 | 1.62.0                    | [`ee21db0a941d`](https://github.com/microsoft/ms-tpm-20-ref/commit/ee21db0a941d) (2024-10-04) |
diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
new file mode 100755
index 0000000..36913dd
--- /dev/null
+++ b/bin/entrypoint.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+set -ex
+stdbuf -oL -eL /usr/bin/tpm2-simulator "$@"