diff --git a/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-Fix_searching_of_afpfsd.patch b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-Fix_searching_of_afpfsd.patch
new file mode 100644
index 0000000000..6de072ea77
--- /dev/null
+++ b/packages/network/afpfs-ng/patches/afpfs-ng-0.8.1-01-Fix_searching_of_afpfsd.patch
@@ -0,0 +1,14 @@
+diff -Naur afpfs-ng-0.8.1/fuse/client.c afpfs-ng-0.8.1.patch/fuse/client.c
+--- afpfs-ng-0.8.1/fuse/client.c	2008-03-08 03:44:16.000000000 +0100
++++ afpfs-ng-0.8.1.patch/fuse/client.c	2011-05-22 19:08:53.938152499 +0200
+@@ -61,8 +61,8 @@
+ 			snprintf(filename, PATH_MAX,
+ 				"/usr/local/bin/%s",AFPFSD_FILENAME);
+ 			if (access(filename,X_OK)) {
+-				snprintf(filename, "/usr/bin/%s",
+-					AFPFSD_FILENAME);
++				snprintf(filename, PATH_MAX,
++				"/usr/bin/%s", AFPFSD_FILENAME);
+ 				if (access(filename,X_OK)) {
+ 					printf("Could not find server (%s)\n",
+ 						filename);
diff --git a/packages/network/netmount/config/netmount.conf.sample b/packages/network/netmount/config/netmount.conf.sample
index d475827566..97de6a75bb 100644
--- a/packages/network/netmount/config/netmount.conf.sample
+++ b/packages/network/netmount/config/netmount.conf.sample
@@ -20,7 +20,7 @@
 # netmount.conf
 #
 # This configuration file allows you to setup network mounts via
-# CIFS (Samba) or NFS while the system is booting
+# CIFS (Samba), NFS or AFP while the system is booting
 #
 # This is an sample file, please rename or copy this file to
 # netmount.conf in the samba share "Configfiles" (or /storage/.config/)
@@ -28,14 +28,16 @@
 # Usage:
 # service | share on server | local mountpoint <| mount options>
 #
-# - "service" can be "nfs" for NFS mounts or "cifs" for CIFS (Samba) mounts
+# - "service" can be "nfs" for NFS mounts, "cifs" for CIFS (Samba) or
+#   "afp" for AFP (Apple File Protocol) mounts
 # - Please use an "|" as delimiter
 # - Don't use spaces in usernames, passwords and options
 # - for NFS mounts there is no support for options
-# - be aware of the different syntax for NFS shares
+# - be aware of the different syntax for NFS and AFP mount
 # - Local mountpoints should only be on /storage
 #
 # Examples:
+# afp | 192.168.1.44/videos | /storage/mount/videos | <username>:<password>
 # cifs | //192.168.1.44/videos | /storage/mount/videos | username=user,pass=secret
 # cifs | //192.168.1.44/tv shows | /storage/mount/tvshows | username=user,pass=secret
 # nfs | 192.168.1.44:/videos | /storage/mount/videos
diff --git a/packages/network/netmount/scripts/netmount b/packages/network/netmount/scripts/netmount
index 49487d93da..60be6806ad 100755
--- a/packages/network/netmount/scripts/netmount
+++ b/packages/network/netmount/scripts/netmount
@@ -38,6 +38,9 @@ IFS="
 
     mkdir -p $MOUNTPOINT
     case "$SERVICE" in
+      afp)
+        mount_afp afp://$OPTIONS@$SHARE "$MOUNTPOINT" > /dev/null 2>&1 &
+        ;;
       cifs)
         mount.cifs "$SHARE" "$MOUNTPOINT" -o "$OPTIONS" > /dev/null 2>&1 &
         ;;