diff --git a/backfiller/Dockerfile b/backfiller/Dockerfile
index e85d330..c2f603c 100644
--- a/backfiller/Dockerfile
+++ b/backfiller/Dockerfile
@@ -1,6 +1,6 @@
 FROM alpine:3.7
 # dependencies needed for compiling c extensions
-RUN apk --update add py2-pip
+RUN apk --update add py2-pip gcc python-dev musl-dev
 
 # Install common lib first as it changes less
 COPY common /tmp/common
diff --git a/backfiller/backfiller/__init__.py b/backfiller/backfiller/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/backfiller/backfiller/__main__.py b/backfiller/backfiller/__main__.py
new file mode 100644
index 0000000..a03755e
--- /dev/null
+++ b/backfiller/backfiller/__main__.py
@@ -0,0 +1,14 @@
+
+import gevent.monkey
+gevent.monkey.patch_all()
+
+import logging
+
+import argh
+
+from backfiller.main import main
+
+LOG_FORMAT = "[%(asctime)s] %(levelname)8s %(name)s(%(module)s:%(lineno)d): %(message)s"
+
+logging.basicConfig(level=logging.INFO, format=LOG_FORMAT)
+argh.dispatch_command(main)
diff --git a/build b/build
index 5970bf3..93d705a 100755
--- a/build
+++ b/build
@@ -8,7 +8,7 @@ set -eu
 # Pass PUSH=true to also push the resulting images, or PUSH=latest to push them as :latest tag
 
 # The different images we can build
-COMPONENTS=(downloader restreamer)
+COMPONENTS=(downloader restreamer backfiller)
 
 # Define push if not already defined
 PUSH=${PUSH:-}