diff --git a/tinc/subnet-up b/tinc/subnet-up
index c619cae..55faea1 100644
--- a/tinc/subnet-up
+++ b/tinc/subnet-up
@@ -2,15 +2,16 @@
 echo "[ROUTE] up: $SUBNET weight $WEIGHT via $NODE ($REMOTEADDRESS:$REMOTEPORT)"
 nonMACChars=`echo $SUBNET | tr -d "[:digit:]" | tr -d [:ABCDEFabcdef]`
 date=`date -u`
+mkdir -p /tmp/tinc/peer/$NODE/mac /tmp/tinc/peer/$NODE/ip
 
 if [ -z "$nonMACChars" ]; then
   # This subnet is a MAC
-  echo "$NODE mac $SUBNET $WEIGHT $REMOTEADDRESS:$REMOTEPORT $date" > /tmp/tinc_peer/$NODE_mac_$SUBNET
+  echo "$NODE mac $SUBNET $WEIGHT $REMOTEADDRESS:$REMOTEPORT $date" > /tmp/tinc/peer/$NODE/mac/$SUBNET
 else
   # This subnet is an IP address
   if echo "$SUBNET" | grep -q -E ".+/32\$"; then
     address=`echo "\$SUBNET" | cut -d '/' -f 1`
-    echo "$NODE ip $SUBNET $WEIGHT $REMOTEADDRESS:$REMOTEPORT $date" > /tmp/tinc_peer/$NODE_ip_$address
+    echo "$NODE ip $SUBNET $WEIGHT $REMOTEADDRESS:$REMOTEPORT $date" > /tmp/tinc/peer/$NODE/ip/$address
   fi
 fi