diff --git a/README.md b/README.md
index 51225689..ad793a82 100644
--- a/README.md
+++ b/README.md
@@ -486,6 +486,20 @@ Manage your UniFi network using a web browser
 
 [:books: UniFi Controller add-on documentation][addon-doc-unifi]
 
+### ✓ [Visual Studio Code][addon-vscode]
+
+![Latest Version][vscode-version-shield]
+![Supports armhf Architecture][vscode-armhf-shield]
+![Supports armv7 Architecture][vscode-armv7-shield]
+![Supports aarch64 Architecture][vscode-aarch64-shield]
+![Supports amd64 Architecture][vscode-amd64-shield]
+![Supports i386 Architecture][vscode-i386-shield]
+![Docker Pulls][vscode-pulls-shield]
+
+Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion!
+
+[:books: Visual Studio Code add-on documentation][addon-doc-vscode]
+
 ### ✓ [chrony][addon-chrony]
 
 ![Latest Version][chrony-version-shield]
@@ -574,6 +588,7 @@ on the correct GitHub repository matching the add-on.
 - [Open an issue for the add-on: Tor][tor-issue]
 - [Open an issue for the add-on: Traccar][traccar-issue]
 - [Open an issue for the add-on: UniFi Controller][unifi-issue]
+- [Open an issue for the add-on: Visual Studio Code][vscode-issue]
 - [Open an issue for the add-on: chrony][chrony-issue]
 - [Open an issue for the add-on: motionEye][motioneye-issue]
 
@@ -945,6 +960,16 @@ SOFTWARE.
 [unifi-armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
 [unifi-armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
 [unifi-i386-shield]: https://img.shields.io/badge/i386-yes-green.svg
+[addon-vscode]: https://github.com/hassio-addons/addon-vscode/tree/v0.1.0
+[addon-doc-vscode]: https://github.com/hassio-addons/addon-vscode/blob/v0.1.0/README.md
+[vscode-issue]: https://github.com/hassio-addons/addon-vscode/issues
+[vscode-version-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[vscode-pulls-shield]: https://img.shields.io/docker/pulls/hassioaddons/vscode-amd64.svg
+[vscode-aarch64-shield]: https://img.shields.io/badge/aarch64-no-red.svg
+[vscode-amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[vscode-armhf-shield]: https://img.shields.io/badge/armhf-no-red.svg
+[vscode-armv7-shield]: https://img.shields.io/badge/armv7-no-red.svg
+[vscode-i386-shield]: https://img.shields.io/badge/i386-no-red.svg
 [addon-chrony]: https://github.com/hassio-addons/addon-chrony/tree/v0.1.0
 [addon-doc-chrony]: https://github.com/hassio-addons/addon-chrony/blob/v0.1.0/README.md
 [chrony-issue]: https://github.com/hassio-addons/addon-chrony/issues
diff --git a/vscode/CHANGELOG.md b/vscode/CHANGELOG.md
new file mode 100644
index 00000000..21f376dd
--- /dev/null
+++ b/vscode/CHANGELOG.md
@@ -0,0 +1 @@
+🎉  Initial add-on release 🎉 
\ No newline at end of file
diff --git a/vscode/README.md b/vscode/README.md
new file mode 100644
index 00000000..679c6c40
--- /dev/null
+++ b/vscode/README.md
@@ -0,0 +1,59 @@
+# Community Hass.io Add-ons: Visual Studio Code
+
+[![Release][release-shield]][release] ![Project Stage][project-stage-shield] ![Project Maintenance][maintenance-shield]
+
+[![Discord][discord-shield]][discord] [![Community Forum][forum-shield]][forum]
+
+[![Buy me a coffee][buymeacoffee-shield]][buymeacoffee]
+
+[![Support my work on Patreon][patreon-shield]][patreon]
+
+Visual Studio Code, accessible through the browser.
+
+## About
+
+This add-on runs Visual Studio Code, allowing you to edit your Home Assistant
+configuration straight from the web browser and can be embedded straight
+into the Home Assistant frontend UI.
+
+Visual Studio Code runs as a remote server using `code-server`, and is a
+fully fledged VSCode experience.
+
+The add-on has the Home Assistant and MDI icons extensions pre-installed
+and pre-configured right out of the box. This means that autocompletion works
+instantly, without the need for configuring anything.
+
+[Click here for the full documentation][docs]
+
+![Visual Studio Code in the Home Assistant Frontend][screenshot]
+
+## WARNING! THIS IS A BETA VERSION!
+
+This Hass.io Add-ons repository contains beta releases of add-ons.
+
+- They might stop working at any time.
+- They could have a negative impact on your system.
+
+This repository was created for:
+
+- Anybody willing to test.
+- Anybody interested in trying out upcoming add-ons or add-on features.
+
+If you are more interested in stable releases of our add-ons:
+
+<https://github.com/hassio-addons/repository>
+
+[buymeacoffee-shield]: https://www.buymeacoffee.com/assets/img/guidelines/download-assets-sm-2.svg
+[buymeacoffee]: https://www.buymeacoffee.com/frenck
+[discord-shield]: https://img.shields.io/discord/478094546522079232.svg
+[discord]: https://discord.me/hassioaddons
+[docs]: https://github.com/hassio-addons/addon-vscode/blob/v0.1.0/README.md
+[forum-shield]: https://img.shields.io/badge/community-forum-brightgreen.svg
+[forum]: https://community.home-assistant.io/?u=frenck
+[maintenance-shield]: https://img.shields.io/maintenance/yes/2019.svg
+[patreon-shield]: https://www.frenck.nl/images/patreon.png
+[patreon]: https://www.patreon.com/frenck
+[project-stage-shield]: https://img.shields.io/badge/project%20stage-experimental-yellow.svg
+[release-shield]: https://img.shields.io/badge/version-v0.1.0-blue.svg
+[release]: https://github.com/hassio-addons/addon-vscode/tree/v0.1.0
+[screenshot]: https://github.com/hassio-addons/addon-vscode/raw/master/images/screenshot.png
\ No newline at end of file
diff --git a/vscode/config.json b/vscode/config.json
new file mode 100644
index 00000000..e4083f44
--- /dev/null
+++ b/vscode/config.json
@@ -0,0 +1,52 @@
+{
+  "name": "Visual Studio Code",
+  "version": "0.1.0",
+  "slug": "vscode",
+  "description": "Fully featured VSCode experience, to edit your HA config in the browser, including auto-completion!",
+  "url": "https://github.com/hassio-addons/addon-vscode",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:1337]",
+  "startup": "services",
+  "arch": [
+    "amd64"
+  ],
+  "boot": "auto",
+  "hassio_api": true,
+  "hassio_role": "homeassistant",
+  "homeassistant_api": true,
+  "host_network": false,
+  "auto_uart": true,
+  "ports": {
+    "1337/tcp": 1337
+  },
+  "map": [
+    "config:rw",
+    "ssl:rw",
+    "addons:rw",
+    "share:rw",
+    "backup:rw"
+  ],
+  "options": {
+    "password": "",
+    "ssl": true,
+    "certfile": "fullchain.pem",
+    "keyfile": "privkey.pem",
+    "packages": [],
+    "init_commands": []
+  },
+  "schema": {
+    "log_level": "match(^(trace|debug|info|notice|warning|error|fatal)$)?",
+    "password": "str",
+    "ssl": "bool",
+    "certfile": "str",
+    "keyfile": "str",
+    "packages": [
+      "str"
+    ],
+    "init_commands": [
+      "str"
+    ],
+    "leave_front_door_open": "bool?",
+    "i_like_to_be_pwned": "bool?"
+  },
+  "image": "hassioaddons/vscode-{arch}"
+}
\ No newline at end of file
diff --git a/vscode/icon.png b/vscode/icon.png
new file mode 100644
index 00000000..b3225e44
Binary files /dev/null and b/vscode/icon.png differ
diff --git a/vscode/logo.png b/vscode/logo.png
new file mode 100644
index 00000000..57a2ca26
Binary files /dev/null and b/vscode/logo.png differ