diff --git a/BUILD.md b/BUILD.md
index b19df73..2f51ba9 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -73,6 +73,15 @@ Reboot your RPi:
 
 ### Build de firmware and upload to ZUMspot RPi
 
+If you are using Pi-Star, expand filesystem (if you haven't done before):
+
+    sudo pistar-expand
+    sudo reboot
+
+Enable RW filesystem if you are using Pi-Star:
+
+    rpi-rw
+
 Install the necessary software tools:
 
     sudo apt-get update
@@ -109,6 +118,12 @@ Build the firmware:
 
     make
 
+If you are using Pi-Star, stop services:
+
+    sudo pistar-watchdog.service stop
+    sudo systemctl stop mmdvmhost.timer
+    sudo systemctl stop mmdvmhost.service
+
 Upload the firmware to ZUMspot RPi board:
 
     sudo make zumspot-pi
@@ -257,6 +272,15 @@ Press the reset button of ZUMspot and upload the firmware:
 
 ## Linux Raspbian
 
+If you are using Pi-Star, expand filesystem (if you haven't done before):
+
+    sudo pistar-expand
+    sudo reboot
+
+Enable RW filesystem if you are using Pi-Star:
+
+    rpi-rw
+
 Install the necessary software tools:
 
     sudo apt-get update
@@ -287,6 +311,12 @@ Build the firmware with bootloader support:
 
     make bl
 
+If you are using Pi-Star, stop services:
+
+    sudo pistar-watchdog.service stop
+    sudo systemctl stop mmdvmhost.timer
+    sudo systemctl stop mmdvmhost.service
+
 Upload bootloader and firmware to ZUMspot Libre Kit, using serial port first (you
 are using an USB-serial converter with device name /dev/ttyUSB0). Move BOOT0
 jumper to 1, next press and release RESET and execute:
@@ -378,6 +408,15 @@ connect the USB cable.
 
 ## Linux Raspbian
 
+If you are using Pi-Star, expand filesystem (if you haven't done before):
+
+    sudo pistar-expand
+    sudo reboot
+
+Enable RW filesystem if you are using Pi-Star:
+
+    rpi-rw
+
 Install the necessary software tools:
 
     sudo apt-get update
@@ -408,6 +447,12 @@ Build the firmware with bootloader support:
 
     make bl
 
+If you are using Pi-Star, stop services:
+
+    sudo pistar-watchdog.service stop
+    sudo systemctl stop mmdvmhost.timer
+    sudo systemctl stop mmdvmhost.service
+
 Upload the firmware to ZUMspot USB:
 
     sudo make dfu devser=/dev/ttyACM0
@@ -434,7 +479,6 @@ Please check here for detailed instructions:
 
     https://github.com/mathisschmieder/MMDVM_HS_Hat/blob/master/README.md
 
-
 # Makefile options
 
 - make clean: delete all objects files *.o, for starting a new firmware building.
diff --git a/README.md b/README.md
index 8e1eed4..0295ef5 100644
--- a/README.md
+++ b/README.md
@@ -87,6 +87,15 @@ Please check here for detailed instructions:
 
 ### ZUMspot Libre Kit (under Linux Raspbian)
 
+If you are using Pi-Star, expand filesystem (if you haven't done before):
+
+    sudo pistar-expand
+    sudo reboot
+
+Enable RW filesystem if you are using Pi-Star:
+
+    rpi-rw
+
 Install the necessary software tools:
 
     sudo apt-get update
@@ -103,6 +112,12 @@ Build the firmware with USB bootloader support (the default Config.h is OK for L
 
     make bl
 
+If you are using Pi-Star, stop services:
+
+    sudo pistar-watchdog.service stop
+    sudo systemctl stop mmdvmhost.timer
+    sudo systemctl stop mmdvmhost.service
+
 Upload the firmware to ZUMspot Libre Kit using the USB port (your Libre Kit has the bootloader already installed):
 
     sudo make dfu devser=/dev/ttyACM0
@@ -138,6 +153,15 @@ Reboot your RPi:
 
 #### Build de firmware and upload to ZUMspot RPi
 
+If you are using Pi-Star, expand filesystem (if you haven't done before):
+
+    sudo pistar-expand
+    sudo reboot
+
+Enable RW filesystem if you are using Pi-Star:
+
+    rpi-rw
+
 Install the necessary software tools:
 
     sudo apt-get update
@@ -172,6 +196,12 @@ Build the firmware:
 
     make
 
+If you are using Pi-Star, stop services:
+
+    sudo pistar-watchdog.service stop
+    sudo systemctl stop mmdvmhost.timer
+    sudo systemctl stop mmdvmhost.service
+
 Upload the firmware to ZUMspot RPi board:
 
     sudo make zumspot-pi