diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000..1231ff28a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+tmp
+*.bat
\ No newline at end of file
diff --git a/README.md b/README.md
index 577d2cba4..913d77cba 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,16 @@
-# hassio-addons
\ No newline at end of file
+# Hassio Add-ons by petersendev
+
+## About
+My hassio addon repository.
+
+## Installation
+
+Adding this add-ons repository to your Hass.io Home Assistant instance is
+pretty easy. Follow [the official instructions][third-party-addons] on the
+website of Home Assistant, and use the following URL:
+
+```txt
+https://github.com/petersendev/hassio-addons
+```
+
+[third-party-addons]: https://home-assistant.io/hassio/installing_third_party_addons/
\ No newline at end of file
diff --git a/repository.json b/repository.json
new file mode 100644
index 000000000..5c0dcae23
--- /dev/null
+++ b/repository.json
@@ -0,0 +1,5 @@
+{
+    "name": "Hass.io Add-ons by petersendev",
+    "url": "https://github.com/petersendev/hassio-addons",
+    "maintainer": "Arne Petersen"
+  }
\ No newline at end of file
diff --git a/znc/Dockerfile b/znc/Dockerfile
new file mode 100644
index 000000000..c3f55bcb8
--- /dev/null
+++ b/znc/Dockerfile
@@ -0,0 +1,9 @@
+FROM linuxserver/znc
+
+# use /data instead of /config for hass.io environment
+RUN sed -i "s|/config|/config/znc|g" /etc/services.d/znc/run \
+    && sed -i "s|/config|/config/znc|g" /etc/cont-init.d/20-config \
+    && sed -i "s|/config/znc/config/zncs|/config/znc/configs|g" /etc/cont-init.d/20-config
+
+# copy local files
+COPY root/ /
\ No newline at end of file
diff --git a/znc/README.md b/znc/README.md
new file mode 100644
index 000000000..ec5d0d9a2
--- /dev/null
+++ b/znc/README.md
@@ -0,0 +1,31 @@
+# Hassio Add-ons by petersendev: ZNC
+
+## About
+
+[ZNC](http://wiki.znc.in/ZNC) is an IRC network bouncer or BNC. It can detach the client from the actual IRC server, and also from selected channels. Multiple clients from different locations can connect to a single ZNC account simultaneously and therefore appear under the same nickname on IRC.
+
+This addon is based on the [docker image](https://github.com/linuxserver/docker-znc) from linuxserver.io.
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+
+## Configuration
+
+Webui can be found at `<your-ip>:6500` for http and `<your-ip>:6501` for ssl (self-genererated certificate).
+
+The default login details (change ASAP) are
+
+`login`: admin, `password`: admin
+
+
+[repository]: https://github.com/petersendev/hassio-addons
\ No newline at end of file
diff --git a/znc/config.json b/znc/config.json
new file mode 100644
index 000000000..d489b1990
--- /dev/null
+++ b/znc/config.json
@@ -0,0 +1,35 @@
+{
+    "name": "znc",
+    "version": "0.0.5",
+    "slug": "znc",
+    "description": "znc add-on based on linuxserver.io image",
+    "url": "https://github.com/petersendev/hassio-addons/znc",
+    "startup": "services",
+    "arch": [
+      "aarch64",
+      "amd64",
+      "armhf"
+    ],
+    "ports": {
+      "6500/tcp": 6500,
+      "6501/tcp": 6501
+    },
+    "ports_description": {
+      "6500/tcp": "no SSL",
+      "6501/tcp": "SSL"
+    },
+    "map": [
+      "config:rw",
+      "share:rw",
+      "ssl"
+    ],
+    "webui": "http://[HOST]:[PORT:6500]",
+    "boot": "auto",
+    "environment": {
+      "PUID": "1000",
+      "PGID": "1000"
+    },
+    "options": {},
+    "schema": {},
+    "image": "petersendev/hassio-znc-{arch}"
+  }
\ No newline at end of file
diff --git a/znc/icon.png b/znc/icon.png
new file mode 100644
index 000000000..4cf0c6c07
Binary files /dev/null and b/znc/icon.png differ
diff --git a/znc/logo.png b/znc/logo.png
new file mode 100644
index 000000000..4cf0c6c07
Binary files /dev/null and b/znc/logo.png differ
diff --git a/znc/root/defaults/znc.conf b/znc/root/defaults/znc.conf
new file mode 100644
index 000000000..c3a6d25cf
--- /dev/null
+++ b/znc/root/defaults/znc.conf
@@ -0,0 +1,35 @@
+// WARNING
+//
+// Do NOT edit this file while ZNC is running!
+// Use webadmin or *controlpanel instead.
+//
+// Altering this file by hand will forfeit all support.
+//
+// But if you feel risky, you might want to read help on /znc saveconfig and /znc rehash.
+// Also check http://en.znc.in/wiki/Configuration
+
+Version = 1.7.x
+<Listener listener0>
+	Port = 6500
+	IPv4 = true
+	IPv6 = false
+	SSL = false
+</Listener>
+<Listener listener1>
+	Port = 6501
+	IPv4 = true
+	IPv6 = false
+	SSL = true
+</Listener>
+LoadModule = webadmin
+
+<User admin>
+	Pass       = sha256#b83fb77b88fede3a01f5a92b2124f3008227828b4b0b6daf389404f68461aa90#X?0DsLk6eUajI4o1.39T#
+	Admin      = true
+	Nick       = admin
+	AltNick    = admin_
+	Ident      = admin
+	RealName   = Got ZNC?
+	LoadModule = chansaver
+	LoadModule = controlpanel
+</User>
\ No newline at end of file