diff --git a/easyinstall.sh b/easyinstall.sh
index 04c78469..2a0ba41c 100755
--- a/easyinstall.sh
+++ b/easyinstall.sh
@@ -772,9 +772,9 @@ function createFileSharingDir() {
 
 # Downloads, compiles, and installs Netatalk (AppleShare server)
 function installNetatalk() {
-    NETATALK_VERSION="230701"
+    NETATALK_VERSION="2.3.1"
     NETATALK_CONFIG_PATH="/etc/netatalk"
-    NETATALK_OPTIONS="--cores=$CORES --share-name='$FILE_SHARE_NAME' --share-path='$FILE_SHARE_PATH'"
+    NETATALK_OPTIONS="--base-dir=$BASE/tmp/netatalk-$NETATALK_VERSION --cores=$CORES --share-name='$FILE_SHARE_NAME' --share-path='$FILE_SHARE_PATH'"
 
     if [ -d "$NETATALK_CONFIG_PATH" ]; then
         echo
@@ -790,13 +790,15 @@ function installNetatalk() {
     fi
 
     echo
-    echo "Downloading tarball to $HOME..."
-    cd $HOME || exit 1
-    wget -O "netatalk-2.$NETATALK_VERSION.tar.gz" "https://github.com/rdmark/netatalk-2.x/releases/download/netatalk-2-$NETATALK_VERSION/netatalk-2.$NETATALK_VERSION.tar.gz" </dev/null
+    echo "Downloading tarball to $BASE/tmp..."
+    mkdir -p "$BASE/tmp"
+    cd "$BASE/tmp" || exit 1
+    wget -O "netatalk-$NETATALK_VERSION.tar.gz" \
+    "https://github.com/Netatalk/netatalk/releases/download/netatalk-`echo $NETATALK_VERSION | sed 's/\./-/g'`/netatalk-$NETATALK_VERSION.tar.xz" </dev/null
 
     echo "Unpacking tarball..."
-    tar -xzf "netatalk-2.$NETATALK_VERSION.tar.gz"
-    rm "netatalk-2.$NETATALK_VERSION.tar.gz"
+    tar -xf "netatalk-$NETATALK_VERSION.tar.gz"
+    rm "netatalk-$NETATALK_VERSION.tar.gz"
 
     if [ -f "/etc/network/interfaces.d/piscsi_bridge" ]; then
         echo "PiSCSI network bridge detected. Using 'piscsi_bridge' interface for AppleTalk."
@@ -807,8 +809,8 @@ function installNetatalk() {
     [[ $SKIP_PACKAGES ]] && NETATALK_OPTIONS="$NETATALK_OPTIONS --no-packages"
     [[ $SKIP_MAKE_CLEAN ]] && NETATALK_OPTIONS="$NETATALK_OPTIONS --no-make-clean"
 
-    cd "$HOME/netatalk-2.$NETATALK_VERSION/contrib/shell_utils" || exit 1
-    bash -c "./debian_install.sh $NETATALK_OPTIONS" || exit 1
+    bash -c "$BASE/shell_scripts/netatalk_install.sh $NETATALK_OPTIONS" || exit 1
+    rm -rf "$BASE/tmp"
 }
 
 # Appends the images dir as a shared Netatalk volume
@@ -1532,7 +1534,7 @@ function showMenu() {
     echo "  4) Install or update PiSCSI Control Board UI (requires hardware)"
     echo "NETWORK BRIDGE ASSISTANT"
     echo "  5) Configure network bridge for Ethernet (DHCP)"
-    echo "  6) Configure network bridge for WiFi (static IP + NAT)" 
+    echo "  6) Configure network bridge for WiFi (static IP + NAT)"
     echo "INSTALL COMPANION APPS"
     echo "  7) Install AppleShare File Server (Netatalk)"
     echo "  8) Install FTP File Server (vsftpd)"
diff --git a/shell_scripts/netatalk_install.sh b/shell_scripts/netatalk_install.sh
new file mode 100755
index 00000000..b0fc7758
--- /dev/null
+++ b/shell_scripts/netatalk_install.sh
@@ -0,0 +1,266 @@
+#!/usr/bin/env bash
+
+# Netatalk install script for Debian Linux. May work on other flavors too.
+# This script should be run from within the contrib/shell_utils directory.
+# Example usage, compiling with four cores:
+#   $ ./debian_install.sh -j=4
+#
+# By Daniel Markstedt
+# Based on RsSCSI easyinstall.sh by sonique6784
+# BSD 3-Clause License
+# Copyright (c) 2022, 2023, Daniel Markstedt
+# Copyright (c) 2020, sonique6784
+
+set -e
+
+USER=$(whoami)
+BASE=$(dirname "$(readlink -f "${0}")")
+CORES=$(nproc)
+SYSCONFDIR="/etc"
+NETATALK_CONFDIR="$SYSCONFDIR/netatalk"
+INSTALL_PACKAGES=1
+MAKE_CLEAN=1
+START_SERVICES=1
+INTERACTIVE=1
+
+# checks to run before installation
+function initialChecks() {
+    if [ "root" == "$USER" ]; then
+        echo "Do not run this script as $USER or with 'sudo'."
+        exit 1
+    fi
+
+    echo "Netatalk install script for Debian Linux."
+    echo "It attempts to set up a universally compatible AFP server:"
+
+    if [[ "$AFP_SHARE_PATH" ]]; then
+        echo " - One shared volume named '$AFP_SHARE_NAME' ($AFP_SHARE_PATH)"
+    else
+        echo " - Shared volume is the home directory of the authenticated user"
+    fi
+
+    echo " - Classic AppleTalk (DDP) support enabled"
+    echo " - TCP/IP (DSI) support and service discovery with Zeroconf / Bonjour enabled"
+    echo " - Cleartxt UAM to authenticate Classic Mac OS clients"
+    echo " - DHX2 UAM to authenticate Mac OS X / macOS clients"
+    echo " - Additional AppleTalk daemons papd (printer server), timelord (time server), and a2boot (Apple II netboot server)"
+    echo
+    echo "The following changes will be made to your system:"
+    echo " - Modify user groups and permissions"
+    echo " - Install packages with apt-get"
+    echo " - Install Netatalk systemd services: afpd, atalkd, cnid, papd, timelord, a2boot"
+    echo " - Create a directory in the current user's home directory where shared files will be stored"
+    echo " - Install binaries to /usr/local/sbin"
+    echo " - Install manpages to /usr/local/share/man"
+    echo " - Install configuration files to $SYSCONFDIR"
+    echo " - Install the CUPS printing system and modify its configuration"
+    echo
+    echo "Input your password to allow this script to make the above changes."
+    sudo -v
+
+    echo
+    echo "IMPORTANT: "$USER" needs to have a password of 8 chars or less due to Classic Mac OS limitations."
+    echo "Do you want to change your password now? [y/N]"
+    read -r REPLY
+    if [ "$REPLY" == "y" ] || [ "$REPLY" == "Y" ]; then
+        passwd
+    fi
+}
+
+function installNetatalk() {
+    echo "Checking for previous versions of Netatalk..."
+    sudo systemctl stop atalkd afpd || true
+
+    if [ -f /etc/init.d/netatalk ]; then
+        echo
+        echo "WARNING: Legacy init scripts for a previous version of Netatalk was detected on your system. It is recommended to back up you configuration files and shared files before proceeding. Press CTRL-C to exit, or any other key to proceed."
+        read
+        sudo /etc/init.d/netatalk stop || true
+    fi
+
+    if [ -f /var/log/afpd.log ]; then
+        echo "Cleaning up /var/log/afpd.log..."
+        sudo rm /var/log/afpd.log
+    fi
+
+    if [[ `grep -c netatalk /etc/rc.local` -eq 1 ]]; then
+        sudo sed -i "/netatalk/d" /etc/rc.local
+        echo "Removed Netatalk from /etc/rc.local -- use systemctl to control Netatalk from now on."
+    fi
+
+    if [[ "$AFP_SHARE_PATH" ]]; then
+        if [ -d "$AFP_SHARE_PATH" ]; then
+            echo "Found a $AFP_SHARE_PATH directory; will use it for file sharing."
+        else
+            echo "Creating the $AFP_SHARE_PATH directory and granting read/write permissions to all users..."
+            sudo mkdir -p "$AFP_SHARE_PATH"
+            sudo chown -R "$USER:$USER" "$AFP_SHARE_PATH"
+            chmod -R 2775 "$AFP_SHARE_PATH"
+        fi
+    fi
+
+    if [ $INSTALL_PACKAGES ]; then
+        echo
+        echo "Installing dependencies..."
+        sudo apt-get update || true
+        sudo apt-get install libssl-dev libdb-dev libcups2-dev cups libavahi-client-dev autotools-dev automake libtool libtool-bin libgcrypt20-dev pkg-config --assume-yes --no-install-recommends </dev/null
+    fi
+
+    cd "$BASE" || exit 1
+
+    if [[ ! -f configure ]]; then
+        echo
+        echo "Bootstrapping Netatalk..."
+        ./bootstrap </dev/null
+    fi
+
+    echo
+    echo "Configuring Netatalk..."
+    ./configure --enable-systemd --enable-overwrite --sysconfdir="$SYSCONFDIR" --with-uams-path=/usr/lib/netatalk </dev/null
+
+    echo
+    echo "Compiling Netatalk with ${CORES} simultaneous core(s)..."
+
+    if [ $MAKE_CLEAN ]; then
+        make clean </dev/null
+    fi
+
+    make all -j "${CORES}" </dev/null
+
+    echo
+    echo "Installing Netatalk..."
+    sudo make install </dev/null
+
+    if [[ `lsmod | grep -c appletalk` -eq 0 ]]; then
+        echo
+        echo "Your system may not have support for AppleTalk networking."
+        echo "You can still use Netatalk with Macs that support AppleTalk over TCP/IP (DSI)."
+        echo "In the Chooser, input the IP address of the network interface that is connected to the rest of your network:"
+        echo `ip -4 addr show scope global | grep -oP '(?<=inet\s)\d+(\.\d+){3}'`
+    fi
+
+    echo
+    echo "Modifying service configurations..."
+
+    if [[ "$AFP_SHARE_PATH" ]]; then
+        echo "$NETATALK_CONFDIR/AppleVolumes.default:"
+        sudo sed -i /^~/d "$NETATALK_CONFDIR/AppleVolumes.default"
+        echo "$AFP_SHARE_PATH \"$AFP_SHARE_NAME\"" | sudo tee -a "$NETATALK_CONFDIR/AppleVolumes.default"
+    fi
+
+    echo "$NETATALK_CONFDIR/afpd.conf:"
+    echo "- -transall -uamlist uams_guest.so,uams_clrtxt.so,uams_dhx2.so -nosavepassword -icon" | sudo tee -a "$NETATALK_CONFDIR/afpd.conf"
+
+    if [[ "$APPLETALK_INTERFACE" ]]; then
+        echo "$NETATALK_CONFDIR/atalkd.conf:"
+        echo "$APPLETALK_INTERFACE" | sudo tee -a "$NETATALK_CONFDIR/atalkd.conf"
+    fi
+
+    echo "$NETATALK_CONFDIR/papd.conf:"
+    echo "cupsautoadd:op=root:" | sudo tee -a "$NETATALK_CONFDIR/papd.conf"
+    sudo usermod -a -G lpadmin $USER
+    sudo cupsctl --remote-admin WebInterface=yes
+    if [[ `sudo grep -c "PreserveJobHistory" /etc/cups/cupsd.conf` -eq 0 ]]; then
+        echo "/etc/cups/cupsd.conf:"
+        sudo sed -i "/MaxLogSize/a PreserveJobHistory\ No" /etc/cups/cupsd.conf
+    fi
+
+    if [ $START_SERVICES ]; then
+        echo
+        echo "Starting systemd services... (this may take a while)"
+        sudo systemctl enable afpd atalkd papd timelord a2boot cups
+        sudo systemctl start afpd atalkd papd timelord a2boot cups
+
+        echo
+        echo "Netatalk daemons are now installed and running, and should be discoverable by your Macs."
+        echo "To authenticate with the file server, use the current username ("$USER") and password."
+        echo
+        echo "To learn more about Netatalk and its capabilities, visit https://netatalk.sourceforge.io"
+        echo "Enjoy Netatalk!"
+        echo
+    fi
+}
+
+function showLogo() {
+    echo
+    echo "        #             #"
+    echo "       ##             ##"
+    echo "      # #             # #"
+    echo "      # #             # #"
+    echo "     #  #             #  #"
+    echo "     #  #    #####    #  #"
+    echo "     #   # ##     ## #   #"
+    echo "     #    #         #    #"
+    echo "      #    # ## ## #    #"
+    echo "       #       #       #"
+    echo "      # #             # #"
+    echo "      # #  ###   ###  # #"
+    echo "     #    #   # #   #    #"
+    echo "     #   #     #     #   #"
+    echo "     #   #     #     #   #"
+    echo "     #   #     #     #   #"
+    echo "     #   #  #  #  #  #   #"
+    echo "    ###  # # # # # # #  ###"
+    echo "   #     # ### # ### #     #"
+    echo "   #      ##### #####      #"
+    echo " #############   ##############"
+    echo "  #          #   #           #"
+    echo "   ###########   ############"
+    echo "             #####"
+    echo "             #   #"
+    echo "              ###"
+    echo "             #   #"
+    echo "# # #########  #  ########## # #"
+    echo "              # #"
+    echo "# # ##########   ########### # #"
+    echo
+}
+
+# parse arguments passed to the script
+while [ "$1" != "" ]; do
+    PARAM=$(echo "$1" | awk -F= '{print $1}')
+    VALUE=$(echo "$1" | awk -F= '{print $2}')
+    case $PARAM in
+        -b | --base-dir)
+            BASE=$VALUE
+            ;;
+        -j | --cores)
+            CORES=$VALUE
+            ;;
+        -d | --sysconf-dir)
+            SYSCONFDIR=$VALUE
+            ;;
+        -n | --share-name)
+            AFP_SHARE_NAME=$VALUE
+            ;;
+        -p | --share-path)
+            AFP_SHARE_PATH=$VALUE
+            ;;
+        -t | --appletalk-interface)
+            APPLETALK_INTERFACE=$VALUE
+            ;;
+        -a | --no-packages)
+            INSTALL_PACKAGES=
+            ;;
+        -c | --no-make-clean)
+            MAKE_CLEAN=
+            ;;
+        -s | --no-start)
+            START_SERVICES=
+            ;;
+        -h | --headless)
+            INTERACTIVE=
+            ;;
+        *)
+            echo "ERROR: unknown parameter \"$PARAM\""
+            exit 1
+            ;;
+    esac
+    shift
+done
+
+showLogo
+if [ $INTERACTIVE ]; then
+    initialChecks
+fi
+installNetatalk