diff --git a/CHANGELOG.md b/CHANGELOG.md
index f006e81..fb3c435 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 20308-RC2 (2019/08/04)
+
+* Add healthcheck
+
 ## 20308-RC1 (2019/07/30)
 
 * JetBrains License Server 20308
diff --git a/Dockerfile b/Dockerfile
index ae2c3d3..ee4ee79 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -42,3 +42,6 @@ VOLUME [ "/data" ]
 
 ENTRYPOINT [ "/entrypoint.sh" ]
 CMD [ "/usr/local/bin/license-server", "run" ]
+
+HEALTHCHECK --interval=10s --timeout=5s \
+  CMD license-server status