diff --git a/README.md b/README.md
index 15371d2..61a05a2 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Collection of Dockerfiles created to build & pack various tools.
     - [1.1. CLI](#11-cli)
 - [2. Tools](#2-tools)
     - [2.1. Bandwhich](#21-bandwhich)
+    - [2.2. auto-editor](#22-auto-editor)
 <!-- /TOC -->
 
 <br>
@@ -57,3 +58,25 @@ https://github.com/imsnif/bandwhich
 ```
 docker run -it --net host bandwhich -i eth0
 ```
+
+<br>
+
+## 2.2. auto-editor
+
+### 2.2.1. Source
+>Auto-Editor is a command line application for automatically editing video and audio by analyzing a variety of methods, most notably audio loudness.
+
+https://github.com/WyattBlue/auto-editor
+
+<br>
+
+### 2.2.2. Example
+Speed-up silent part of videos:
+```
+docker run -v /home/ruakij/Videos:/video auto-build --no-open --silent-speed 8 --margin 0.2sec "input.webm" -o edited.mp4
+```
+
+<br>
+
+### 2.2.3. Comment
+TODO: Unfortunately the tool requires ffmpeg which is a huge tool and blows up the size of the image. I have to find a way to use a minimized version of it.
diff --git a/tools/auto-editor/Dockerfile b/tools/auto-editor/Dockerfile
new file mode 100644
index 0000000..d1efce1
--- /dev/null
+++ b/tools/auto-editor/Dockerfile
@@ -0,0 +1,24 @@
+# ---- Base ----
+FROM python:slim AS base
+#ENV PYTHONDONTWRITEBYTECODE=1
+WORKDIR /app
+# Install packages
+RUN apt update && apt install -y ffmpeg && rm -rf /var/lib/apt/lists/*
+#RUN pip install --no-compile --no-cache-dir ae-ffmpeg
+#COPY .build/repository/ae-ffmpeg/ae_ffmpeg/Darwin-x86_64/* /usr/bin/
+
+# ---- Build ----
+FROM base AS build
+ENV PYTHONDONTWRITEBYTECODE=1
+# Copy sources
+ADD .build/repository/auto_editor auto_editor
+ADD .build/repository/setup.py .
+ADD .build/repository/README.md .
+# Run install
+RUN pip install --no-compile --no-cache-dir -e .
+
+# ---- Release ----
+FROM build AS release
+WORKDIR /videos
+
+ENTRYPOINT ["auto-editor"]
diff --git a/tools/auto-editor/info.env b/tools/auto-editor/info.env
new file mode 100644
index 0000000..fab8c9d
--- /dev/null
+++ b/tools/auto-editor/info.env
@@ -0,0 +1,2 @@
+GIT_REPOSITORY=https://github.com/WyattBlue/auto-editor
+TAG=latest-tag