diff --git a/README.md b/README.md
index c69daa74961af4936efb2901c4c9195e0a5c21a3..a036dbeceae9643d5186d083ca888e9a578bffa8 100644
--- a/README.md
+++ b/README.md
@@ -31,11 +31,13 @@ tangodb         | MariaDB database holding TANGO database tables
 databaseds      | TANGO database device server
 tangotest       | TANGO test device
 jive            | Container running Jive application
+logviewer       | Container running TANGO log viewer
 pogo            | Pogo TANGO application
 astor           | Astor application
 starter-example | Example service running TANGO Starter device
 itango          | interactive itango session
 
+
 To start and stop a minimal TANGO system (database and databaseds server),
 execute:
 
diff --git a/docker-compose/logviewer.yml b/docker-compose/logviewer.yml
new file mode 100644
index 0000000000000000000000000000000000000000..0af413dc6619cbde491fd12dc9309c684939593e
--- /dev/null
+++ b/docker-compose/logviewer.yml
@@ -0,0 +1,33 @@
+#
+# Docker compose file that launches LogViewer, sending output to a remote X11
+# display.
+#
+# Defines:
+#   - logviewer: container running LogViewer
+#
+# Requires:
+#   - tango.yml
+#
+version: '2'
+
+services:
+  logviewer:
+    build:      
+      context: ../docker/tango/tango-java
+    image: ska/tango-java:latest
+    container_name: logviewer
+    depends_on:
+      - databaseds
+    volumes:
+      - $HOME:/hosthome:ro
+    environment:
+      - XAUTHORITY=/hosthome/.Xauthority
+      - DISPLAY=${DISPLAY}
+      - TANGO_HOST=databaseds:10000 
+    entrypoint:
+      - /usr/local/bin/wait-for-it.sh
+      - databaseds:10000
+      - --timeout=30
+      - --strict
+      - --
+      - /usr/local/bin/logviewer