diff --git a/.travis.yml b/.travis.yml
index 196322cb..db67ff90 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,7 @@ script:
   - env GOOS=windows GOARCH=386 go build -ldflags="-s -w"
   - mkdir win32
   - ln dnscrypt-proxy.exe win32/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt win32/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt win32/
   - ln ../windows/* win32/
   - zip -9 -r dnscrypt-proxy-win32-${TRAVIS_TAG:-dev}.zip win32
 
@@ -27,7 +27,7 @@ script:
   - env GOOS=windows GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir win64
   - ln dnscrypt-proxy.exe win64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt win64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt win64/
   - ln ../windows/* win64/
   - zip -9 -r dnscrypt-proxy-win64-${TRAVIS_TAG:-dev}.zip win64
 
@@ -35,112 +35,112 @@ script:
   - env GO386=387 GOOS=openbsd GOARCH=386 go build -ldflags="-s -w"
   - mkdir openbsd-i386
   - ln dnscrypt-proxy openbsd-i386/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt openbsd-i386/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt openbsd-i386/
   - tar czpvf dnscrypt-proxy-openbsd_i386-${TRAVIS_TAG:-dev}.tar.gz openbsd-i386
 
   - go clean
   - env GOOS=openbsd GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir openbsd-amd64
   - ln dnscrypt-proxy openbsd-amd64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt openbsd-amd64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt openbsd-amd64/
   - tar czpvf dnscrypt-proxy-openbsd_amd64-${TRAVIS_TAG:-dev}.tar.gz openbsd-amd64
 
   - go clean
   - env GOOS=freebsd GOARCH=386 go build -ldflags="-s -w"
   - mkdir freebsd-i386
   - ln dnscrypt-proxy freebsd-i386/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt freebsd-i386/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt freebsd-i386/
   - tar czpvf dnscrypt-proxy-freebsd_i386-${TRAVIS_TAG:-dev}.tar.gz freebsd-i386
 
   - go clean
   - env GOOS=freebsd GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir freebsd-amd64
   - ln dnscrypt-proxy freebsd-amd64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt freebsd-amd64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt freebsd-amd64/
   - tar czpvf dnscrypt-proxy-freebsd_amd64-${TRAVIS_TAG:-dev}.tar.gz freebsd-amd64
 
   - go clean
   - env GOOS=dragonfly GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir dragonflybsd-amd64
   - ln dnscrypt-proxy dragonflybsd-amd64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt dragonflybsd-amd64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt dragonflybsd-amd64/
   - tar czpvf dnscrypt-proxy-dragonflybsd_amd64-${TRAVIS_TAG:-dev}.tar.gz dragonflybsd-amd64
 
   - go clean
   - env GOOS=netbsd GOARCH=386 go build -ldflags="-s -w"
   - mkdir netbsd-i386
   - ln dnscrypt-proxy netbsd-i386/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt netbsd-i386/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt netbsd-i386/
   - tar czpvf dnscrypt-proxy-netbsd_i386-${TRAVIS_TAG:-dev}.tar.gz netbsd-i386
 
   - go clean
   - env GOOS=netbsd GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir netbsd-amd64
   - ln dnscrypt-proxy netbsd-amd64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt netbsd-amd64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt netbsd-amd64/
   - tar czpvf dnscrypt-proxy-netbsd_amd64-${TRAVIS_TAG:-dev}.tar.gz netbsd-amd64
 
   - go clean
   - env GOOS=linux GOARCH=386 go build -ldflags="-s -w"
   - mkdir linux-i386
   - ln dnscrypt-proxy linux-i386/
-  - ln ../LICENSE ../systemd/* example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-i386/
+  - ln ../LICENSE ../systemd/* example-dnscrypt-proxy.toml example-*.txt linux-i386/
   - tar czpvf dnscrypt-proxy-linux_i386-${TRAVIS_TAG:-dev}.tar.gz linux-i386
 
   - go clean
   - env GOOS=linux GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir linux-x86_64
   - ln dnscrypt-proxy linux-x86_64/
-  - ln ../LICENSE ../systemd/* example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-x86_64/
+  - ln ../LICENSE ../systemd/* example-dnscrypt-proxy.toml example-*.txt linux-x86_64/
   - tar czpvf dnscrypt-proxy-linux_x86_64-${TRAVIS_TAG:-dev}.tar.gz linux-x86_64
 
   - go clean
   - env GOOS=linux GOARCH=arm go build -ldflags="-s -w"
   - mkdir linux-arm
   - ln dnscrypt-proxy linux-arm/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-arm/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt linux-arm/
   - tar czpvf dnscrypt-proxy-linux_arm-${TRAVIS_TAG:-dev}.tar.gz linux-arm
 
   - go clean
   - env GOOS=linux GOARCH=arm64 go build -ldflags="-s -w"
   - mkdir linux-arm64
   - ln dnscrypt-proxy linux-arm64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-arm64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt linux-arm64/
   - tar czpvf dnscrypt-proxy-linux_arm64-${TRAVIS_TAG:-dev}.tar.gz linux-arm64
 
   - go clean
   - env GOOS=linux GOARCH=mips GOMIPS=softfloat go build -ldflags="-s -w"
   - mkdir linux-mips
   - ln dnscrypt-proxy linux-mips/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-mips/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt linux-mips/
   - tar czpvf dnscrypt-proxy-linux_mips-${TRAVIS_TAG:-dev}.tar.gz linux-mips
 
   - go clean
   - env GOOS=linux GOARCH=mipsle GOMIPS=softfloat go build -ldflags="-s -w"
   - mkdir linux-mipsle
   - ln dnscrypt-proxy linux-mipsle/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-mipsle/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt linux-mipsle/
   - tar czpvf dnscrypt-proxy-linux_mipsle-${TRAVIS_TAG:-dev}.tar.gz linux-mipsle
 
   - go clean
   - env GOOS=linux GOARCH=mips64 go build -ldflags="-s -w"
   - mkdir linux-mips64
   - ln dnscrypt-proxy linux-mips64/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-mips64/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt linux-mips64/
   - tar czpvf dnscrypt-proxy-linux_mips64-${TRAVIS_TAG:-dev}.tar.gz linux-mips64
 
   - go clean
   - env GOOS=linux GOARCH=mips64le go build -ldflags="-s -w"
   - mkdir linux-mips64le
   - ln dnscrypt-proxy linux-mips64le/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt linux-mips64le/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt linux-mips64le/
   - tar czpvf dnscrypt-proxy-linux_mips64le-${TRAVIS_TAG:-dev}.tar.gz linux-mips64le
 
   - go clean
   - env GOOS=darwin GOARCH=amd64 go build -ldflags="-s -w"
   - mkdir macos
   - ln dnscrypt-proxy macos/
-  - ln ../LICENSE example-dnscrypt-proxy.toml example-forwarding-rules.txt example-blacklist.txt macos/
+  - ln ../LICENSE example-dnscrypt-proxy.toml example-*.txt macos/
   - tar czpvf dnscrypt-proxy-macos-${TRAVIS_TAG:-dev}.tar.gz macos
 
   - ls -l dnscrypt-proxy-*.tar.gz dnscrypt-proxy-*.zip
diff --git a/dnscrypt-proxy/example-cloaking-rules.txt b/dnscrypt-proxy/example-cloaking-rules.txt
new file mode 100644
index 00000000..19db9d10
--- /dev/null
+++ b/dnscrypt-proxy/example-cloaking-rules.txt
@@ -0,0 +1,11 @@
+www.google.com           forcesafesearch.google.com
+www.google.fr            forcesafesearch.google.com
+
+www.bing.com             strict.bing.com
+
+www.youtube.com          restrict.youtube.com
+m.youtube.com            restrict.youtube.com
+youtubei.googleapis.com  restrict.youtube.com
+youtube.googleapis.com   restrict.youtube.com
+www.youtube-nocookie.com restrict.youtube.com
+
diff --git a/dnscrypt-proxy/example-dnscrypt-proxy.toml b/dnscrypt-proxy/example-dnscrypt-proxy.toml
index 242da95d..e1c4c66f 100644
--- a/dnscrypt-proxy/example-dnscrypt-proxy.toml
+++ b/dnscrypt-proxy/example-dnscrypt-proxy.toml
@@ -134,12 +134,13 @@ block_ipv6 = false
 #        Cloaking rules       #
 ###############################
 
-## Cloaking returns a predefined IP address for a specific name
-## It can also resolve a different name, and return the address found for that other name
+## Cloaking returns a predefined address for a specific name.
+## In addition to acting as a HOSTS file, it can also return the IP address
+## of a different name. It will also do CNAME flattening.
 ##
 ## Example map entries (one entry per line)
-## example.com 1.1.1.1
-## google.com  forcesafesearch.google.com
+## example.com     10.1.1.1
+## www.google.com  forcesafesearch.google.com
 
 # cloaking_rules = 'cloaking-rules.txt'