diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10df736..138ed69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,5 +4,7 @@
 
   ***WARNING:*** The behavior of **mdev-conf** is slightly different -- only **/dev/sd** or **/dev/xvd** symlinks are created, *not both*!
 
+* Tiny Cloud configuration has moved to **/etc/tiny-cloud.conf**.
+
 ----
 _CHANGELOG begins 2023-04-29_
diff --git a/Makefile b/Makefile
index b44e107..df08873 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ core:
 		lib/tiny-cloud/mdev \
 		lib/tiny-cloud/tiny-cloud.conf
 	install -Dm644 lib/tiny-cloud/tiny-cloud.conf \
-		"$(PREFIX)"/etc/conf.d/tiny-cloud
+		"$(PREFIX)"/etc/tiny-cloud.conf
 
 network:
 	install -Dm644 -t "$(PREFIX)"/etc/network/interfaces.d \
@@ -69,4 +69,3 @@ Kyuafile:
 	echo "test_suite('tiny-cloud')" >> $@.tmp
 	echo "include('tests/Kyuafile')" >> $@.tmp
 	mv $@.tmp $@
-
diff --git a/README.md b/README.md
index 1715799..87b7ec3 100644
--- a/README.md
+++ b/README.md
@@ -81,7 +81,7 @@ rc-update add tiny-cloud-final default
 
 ## Configuration
 
-By default, Tiny Cloud expects configuration at `/etc/conf.d/tiny-cloud`,
+By default, Tiny Cloud expects configuration at `/etc/tiny-cloud.conf`,
 The stock [lib/tiny-cloud/tiny-cloud.conf`](lib/tiny-cloud/tiny-cloud.conf)
 file contains details of all tuneable settings.
 
diff --git a/lib/tiny-cloud/common b/lib/tiny-cloud/common
index 0b9b325..c9ff82a 100644
--- a/lib/tiny-cloud/common
+++ b/lib/tiny-cloud/common
@@ -2,7 +2,7 @@
 # vim: ts=4 et ft=sh:
 
 # set defaults
-[ -f "$ROOT"/etc/conf.d/tiny-cloud ] && . "$ROOT"/etc/conf.d/tiny-cloud
+[ -f "$ROOT"/etc/tiny-cloud.conf ] && . "$ROOT"/etc/tiny-cloud.conf
 : "${CLOUD:=unknown}"
 : "${CLOUD_USER:=alpine}"
 : "${TINY_CLOUD_LOGS:=$ROOT/var/log}"
diff --git a/lib/tiny-cloud/tiny-cloud.conf b/lib/tiny-cloud/tiny-cloud.conf
index 5daf7ab..d6e2214 100644
--- a/lib/tiny-cloud/tiny-cloud.conf
+++ b/lib/tiny-cloud/tiny-cloud.conf
@@ -1,5 +1,5 @@
 # Tiny Cloud configuration
-# /etc/conf.d/tiny-cloud
+# /etc/tiny-cloud.conf
 
 # REQUIRED: The instance's cloud provider
 # valid: aws, azure, gcp, oci, nocloud