diff --git a/tinc/subnet-up.tmpl b/tinc/subnet-up.tmpl
index 41a52bf..6f4969f 100644
--- a/tinc/subnet-up.tmpl
+++ b/tinc/subnet-up.tmpl
@@ -6,11 +6,13 @@ if [ -z "\$nonMACChars" ]; then
   # This subnet is a MAC
   echo "\$SUBNET" > \$macFile
 else
-  if echo "\$SUBNET" | grep -q -E ".+/32$"; then
+  if echo "\$SUBNET" | grep -q -E ".+/32\$"; then
     # This subnet is likely an IP address, add it to the ARP table
     if test -f "\$macFile"; then
       mac=`cat \$macFile`
-      arp -s "\$SUBNET" "\$mac"
+      address=`echo "\$SUBNET" | cut -d '/' -f 1`
+      echo "Mapping \$address <=> \$mac in ARP table"
+      arp -s "\$address" "\$mac"
     else
       echo "[WARNING] No MAC known for node \$NODE, can't route \$SUBNET. This is only a problem if this is a remote route."
     fi