diff --git a/moonarch-git/PKGBUILD b/moonarch-git/PKGBUILD
index c7b504d..aaf0d64 100644
--- a/moonarch-git/PKGBUILD
+++ b/moonarch-git/PKGBUILD
@@ -190,6 +190,14 @@ package() {
             "$pkgdir/etc/systemd/user/graphical-session.target.wants/$(basename "$svc")"
     done
 
+    # --- udev rules -> /usr/lib/udev/rules.d/ ---
+    install -Dm644 defaults/etc/udev/rules.d/90-moonarch-battery.rules \
+        "$pkgdir/usr/lib/udev/rules.d/90-moonarch-battery.rules"
+
+    # --- Systemd system service (battery conservation restore) -> /usr/lib/systemd/system/ ---
+    install -Dm644 defaults/etc/systemd/system/moonarch-batsaver.service \
+        "$pkgdir/usr/lib/systemd/system/moonarch-batsaver.service"
+
 }
 
 backup=(
diff --git a/moonarch-git/moonarch.install b/moonarch-git/moonarch.install
index a2598cb..6503737 100644
--- a/moonarch-git/moonarch.install
+++ b/moonarch-git/moonarch.install
@@ -71,6 +71,12 @@ post_install() {
     rm -f /usr/local/bin/swww /usr/local/bin/swww-daemon 2>/dev/null || true
     rm -f /usr/local/bin/moonarch-update 2>/dev/null || true
 
+    # Battery conservation mode: create state directory and enable restore service
+    install -dm775 -g wheel /var/lib/moonarch
+    if [ -f /sys/class/power_supply/BAT0/charge_control_end_threshold ]; then
+        systemctl enable moonarch-batsaver.service 2>/dev/null || true
+    fi
+
     echo "==> Moonarch defaults installed."
     echo "==> For first-time setup run: /opt/moonarch/scripts/post-install.sh"
     echo "==> This enables services and configures firewall."