diff --git a/README.md b/README.md
index a3329ae..bb123cf 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 [![GoDoc](https://godoc.org/github.com/pepa65/bat?status.svg)](https://godoc.org/github.com/pepa65/bat)
 ![Continuous Integration](https://github.com/pepa65/bat/actions/workflows/ci.yaml/badge.svg)
 
-# bat v0.14.0
+# bat v0.15.0
 **Manage battery charge limit**
 
 * Repo: github.com/pepa65/bat
@@ -11,14 +11,14 @@
 * Required: Linux-5.4-rc1+ systemd-244+
  
 ```
-bat v0.14.0 - Manage battery charge limit
+bat v0.15.0 - Manage battery charge limit
 Repo:  github.com/pepa65/bat
 Usage: bat <option>
   Options (every option except 's[tatus]' needs root privileges):
     [s[tatus]]         Display charge level, limit, health & persist status.
     [l[imit]] <int>    Set the charge limit to <int> percent.
-    p[ersist]          Install and enable the persist systemd unit files.
-    r[emove]           Remove the persist systemd unit files.
+    p[ersist]          Persist the charge limit after driver reloads.
+    r[emove]           Do not persist the charge limit after driver reloads.
     h[elp]             Just display this help text.
     v[ersion]          Just display version information.
 The battery with regex 'BAT.' in environment variable BAT_SELECT will be used.
diff --git a/help.tmpl b/help.tmpl
index a1c8142..4760bba 100644
--- a/help.tmpl
+++ b/help.tmpl
@@ -4,8 +4,8 @@ Usage: bat <option>
   Options (every option except 's[tatus]' needs root privileges):
     [s[tatus]]         Display charge level, limit, health & persist status.
     [l[imit]] <int>    Set the charge limit to <int> percent.
-    p[ersist]          Install and enable the persist systemd unit files.
-    r[emove]           Remove the persist systemd unit files.
+    p[ersist]          Persist the charge limit after driver reloads.
+    r[emove]           Do not persist the charge limit after driver reloads.
     h[elp]             Just display this help text.
     v[ersion]          Just display version information.
-The battery with regex 'BAT.' in environment variable BAT_SELECT will be used.
+If environment variable BAT_SELECT is set to regex 'BAT.' then it will be used.
diff --git a/main.go b/main.go
index e473106..2ef86be 100644
--- a/main.go
+++ b/main.go
@@ -15,27 +15,29 @@ import (
 )
 
 const (
-	version   = "0.14.0"
-	years     = "2023"
-	prefix    = "chargelimit-"
-	syspath   = "/sys/class/power_supply/"
-  threshold = "charge_control_end_threshold"
-  services  = "/etc/systemd/system/"
+	version       = "0.15.0"
+	years         = "2023"
+	prefix        = "chargelimit-"
+	services      = "/etc/systemd/system/"
+	sleepfilename = "/usr/lib/systemd/system-sleep/chargelimit"
+	syspath       = "/sys/class/power_supply/"
+	threshold     = "charge_control_end_threshold"
 )
 
 var events = [...]string{
 	"hibernate",
 	"hybrid-sleep",
 	"multi-user",
-	"sleep",
 	"suspend",
-	"suspend-then-hibernate",}
+	"suspend-then-hibernate"}
 
 var (
 	//go:embed unit.tmpl
-	unitfile   string
+	unitfile string
+	//go:embed system-sleep.tmpl
+	sleepfile string
 	//go:embed help.tmpl
-	helpmsg    string
+	helpmsg string
 	//go:embed version.tmpl
 	versionmsg string
 	batpath    string
@@ -161,6 +163,10 @@ func main() {
 					disabled = true
 				}
 			}
+			_, err = os.Stat(sleepfilename)
+			if errors.Is(err, os.ErrNotExist) {
+				disabled = true
+			}
 			enabled := "yes"
 			if disabled {
 				enabled = "no"
@@ -226,9 +232,19 @@ func main() {
 				errexit("could not enable systemd unit file '" + service + "'")
 			}
 		}
+		f, err := os.Create(sleepfilename)
+		if err != nil {
+			errexit("could not create system-sleep file '" + sleepfilename + "'")
+		}
+		defer f.Close()
+		_, err = f.WriteString(fmt.Sprintf(sleepfile, current, bat, current, bat))
+		if err != nil {
+			errexit("could not instantiate system-sleep file '" + sleepfilename + "'")
+		}
 
 		fmt.Printf("[%s] Persistence enabled for charge limit: %d\n", bat, current)
 	case "r", "remove", "-r", "--remove":
+		os.Remove(sleepfilename)
 		for _, event := range events {
 			service := prefix + event + ".service"
 			file := services + service
@@ -241,7 +257,7 @@ func main() {
 					continue
 				case strings.Contains(message, "Access denied"):
 					errexit("insufficient permissions, run with root privileges")
-        default:
+				default:
 					errexit("failure to disable unit file '" + service + "'")
 				}
 			}
diff --git a/system-sleep.tmpl b/system-sleep.tmpl
new file mode 100644
index 0000000..1f29280
--- /dev/null
+++ b/system-sleep.tmpl
@@ -0,0 +1,6 @@
+#!/bin/sh
+# %d charge_control_end_threshold for %s
+
+test "x$1" = "xpost" &&
+	/usr/bin/echo %d >/sys/class/power_supply/%s/charge_control_end_threshold
+exit 0