diff --git a/.gitignore b/.gitignore
index b81de84..2697d35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Example .gitignore file for your config dir.
 # An * ensures that everything will be ignored.
-*
+
 # You can whitelist files/folders with !, these will not be ignored.
 !*.yaml
 !.gitignore
@@ -10,6 +10,15 @@
 .storage
 .cloud
 .google.token
+.HA_VERSION
+*.log
+*.log.1
+*.log.fault
+*.db
+*.png
+home-assistant_v2*
+custom_components
+
 
 # Ensure these YAML files are ignored, otherwise your secret data/credentials will leak.
 ip_bans.yaml
diff --git a/esphome/.gitignore b/esphome/.gitignore
new file mode 100644
index 0000000..d8b4157
--- /dev/null
+++ b/esphome/.gitignore
@@ -0,0 +1,5 @@
+# Gitignore settings for ESPHome
+# This is an example and may include too much for your use-case.
+# You can modify this file to suit your needs.
+/.esphome/
+/secrets.yaml