diff --git a/net-dns/ddns-go/ddns-go-6.1.1.ebuild b/net-dns/ddns-go/ddns-go-6.1.1-r1.ebuild
similarity index 98%
rename from net-dns/ddns-go/ddns-go-6.1.1.ebuild
rename to net-dns/ddns-go/ddns-go-6.1.1-r1.ebuild
index bea5483..7184276 100644
--- a/net-dns/ddns-go/ddns-go-6.1.1.ebuild
+++ b/net-dns/ddns-go/ddns-go-6.1.1-r1.ebuild
@@ -37,5 +37,5 @@ src_install() {
 	systemd_newunit "${FILESDIR}/${PN}_at.service" "${PN}@.service"
 	systemd_dounit "${FILESDIR}/${PN}-web.service"
 	systemd_newunit "${FILESDIR}/${PN}-web_at.service" "${PN}-web@.service"
-	keepdir /etc/${PN}
+	keepdir "/etc/${PN}"
 }
diff --git a/net-dns/ddns-go/files/ddns-go-web.service b/net-dns/ddns-go/files/ddns-go-web.service
index 2d6bc0c..9df485b 100644
--- a/net-dns/ddns-go/files/ddns-go-web.service
+++ b/net-dns/ddns-go/files/ddns-go-web.service
@@ -2,7 +2,7 @@
 Description=DDNS-GO with default config, and web user interface
 Requires=network.target
 After=network-online.target
-Conflicts=ddns-go.service ddns-go@config.service ddns-go-web@config.service
+Conflicts=ddns-go.service ddns-go@config.service ddns-go-web@.service
 
 [Service]
 Type=simple
diff --git a/net-dns/ddns-go/files/ddns-go-web_at.service b/net-dns/ddns-go/files/ddns-go-web_at.service
index b501adc..d48f36d 100644
--- a/net-dns/ddns-go/files/ddns-go-web_at.service
+++ b/net-dns/ddns-go/files/ddns-go-web_at.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=DDNS-GO with config %i, and web user interface
+Description=DDNS-GO with config '%i', and web user interface
 Requires=network.target
 After=network-online.target
-Conflicts=ddns-go.service ddns-go-web.service ddns-go@%i.service
+Conflicts=ddns-go.service ddns-go-web.service ddns-go@%i.service ddns-go-web@.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/ddns-go -c /etc/ddns-go/%i.yaml
+ExecStart=/usr/bin/ddns-go -c "/etc/ddns-go/%i.yaml"
 Restart=on-failure
 RestartSec=60
 
diff --git a/net-dns/ddns-go/files/ddns-go_at.service b/net-dns/ddns-go/files/ddns-go_at.service
index ebeee4b..e3b8101 100644
--- a/net-dns/ddns-go/files/ddns-go_at.service
+++ b/net-dns/ddns-go/files/ddns-go_at.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=DDNS-GO with config %i
+Description=DDNS-GO with config '%i'
 Requires=network.target
 After=network-online.target
 Conflicts=ddns-go.service ddns-go-web.service ddns-go-web@%i.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/ddns-go -noweb -c /etc/ddns-go/%i.yaml
+ExecStart=/usr/bin/ddns-go -noweb -c "/etc/ddns-go/%i.yaml"
 Restart=on-failure
 RestartSec=60