diff --git a/oscam/Dockerfile b/oscam/Dockerfile
new file mode 100644
index 0000000..fc88bac
--- /dev/null
+++ b/oscam/Dockerfile
@@ -0,0 +1,14 @@
+ARG BUILD_FROM=lscr.io/linuxserver/oscam:latest
+# hadolint ignore=DL3006
+FROM ${BUILD_FROM}
+
+# copy local files
+COPY root/ /
+
+RUN chmod a+x /etc/s6-overlay/s6-rc.d/svc-oscam/run
+
+# Ports and volumes
+EXPOSE 8888
+EXPOSE 9999
+
+VOLUME /config
diff --git a/oscam/build.yaml b/oscam/build.yaml
new file mode 100644
index 0000000..e0f4ad0
--- /dev/null
+++ b/oscam/build.yaml
@@ -0,0 +1,4 @@
+---
+build_from:
+  aarch64: lscr.io/linuxserver/oscam:latest
+  amd64: lscr.io/linuxserver/oscam:latest
diff --git a/oscam/config.yaml b/oscam/config.yaml
new file mode 100644
index 0000000..698fbd6
--- /dev/null
+++ b/oscam/config.yaml
@@ -0,0 +1,22 @@
+name: OSCAM
+version: 1.1
+slug: oscam
+description: This add-on allows you to have a OSCAM-Server.
+arch:
+  - armv7
+  - aarch64
+  - amd64
+startup: application
+webui: 'http://[HOST]:[PORT:8888]'
+boot: auto
+init: false
+uart: true
+ports:
+  8888/tcp: 8888
+  9999/tcp: 9999
+ports_description:
+  8888/tcp: Web Interface
+  9999/tcp: OSCAM Server
+map:
+  - 'config:rw'
+hassio_role: default
diff --git a/oscam/icon.png b/oscam/icon.png
new file mode 100644
index 0000000..99064a5
Binary files /dev/null and b/oscam/icon.png differ
diff --git a/oscam/logo.png b/oscam/logo.png
new file mode 100644
index 0000000..1737cf3
Binary files /dev/null and b/oscam/logo.png differ
diff --git a/oscam/root/etc/s6-overlay/s6-rc.d/svc-oscam/run b/oscam/root/etc/s6-overlay/s6-rc.d/svc-oscam/run
new file mode 100644
index 0000000..bf64d86
--- /dev/null
+++ b/oscam/root/etc/s6-overlay/s6-rc.d/svc-oscam/run
@@ -0,0 +1,6 @@
+#!/usr/bin/with-contenv bash
+# shellcheck shell=bash
+
+exec \
+    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8888" \
+        /usr/bin/oscam -c /config/oscam