diff --git a/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile b/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile
index 844d659419..a5613864a4 100644
--- a/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_bluegiga.makefile
@@ -32,4 +32,4 @@ ap.CFLAGS += -DMODEM_LED=$(MODEM_LED)
 endif
 
 ap.srcs += $(SRC_SUBSYSTEMS)/datalink/downlink.c $(SRC_SUBSYSTEMS)/datalink/bluegiga.c
-ap.srcs += $(PAPARAZZI_HOME)/var/lib/pprzlink/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c
+ap.srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c $(SRC_SUBSYSTEMS)/datalink/telemetry.c
diff --git a/conf/firmwares/subsystems/shared/telemetry_ivy.makefile b/conf/firmwares/subsystems/shared/telemetry_ivy.makefile
index 2b5ba2901c..aeb34dbfb0 100644
--- a/conf/firmwares/subsystems/shared/telemetry_ivy.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_ivy.makefile
@@ -1,3 +1,3 @@
 $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=ivy_tp -DDOWNLINK_DEVICE=ivy_tp
-$(TARGET).srcs += $(PAPARAZZI_HOME)/var/lib/pprzlink/ivy_transport.c
+$(TARGET).srcs += $(PAPARAZZI_HOME)/var/share/pprzlink/src/ivy_transport.c
 $(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/telemetry.c
diff --git a/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile b/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
index a0a712f862..ed8d664826 100644
--- a/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_superbitrf.makefile
@@ -7,4 +7,4 @@ $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=superbitrf
 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=SUPERBITRF
 
 $(TARGET).srcs += peripherals/cyrf6936.c
-$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/lib/pprzlink/pprz_transport.c subsystems/datalink/telemetry.c
+$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/superbitrf.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
diff --git a/conf/firmwares/subsystems/shared/telemetry_transparent.makefile b/conf/firmwares/subsystems/shared/telemetry_transparent.makefile
index de7d5e2362..77854f5e9e 100644
--- a/conf/firmwares/subsystems/shared/telemetry_transparent.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_transparent.makefile
@@ -13,5 +13,5 @@ $(TARGET).CFLAGS += -D$(PPRZ_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD)
 
 $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(PPRZ_MODEM_PORT_LOWER) -DPPRZ_UART=$(PPRZ_MODEM_PORT_LOWER)
 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
-$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/lib/pprzlink/pprz_transport.c subsystems/datalink/telemetry.c
+$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
 
diff --git a/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile b/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile
index 763d25f1bb..a803cfb0d4 100644
--- a/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_transparent_udp.makefile
@@ -19,5 +19,5 @@ TELEM_CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ
 
 
 $(TARGET).CFLAGS += $(MODEM_CFLAGS) $(TELEM_CFLAGS)
-$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/lib/pprzlink/pprz_transport.c subsystems/datalink/telemetry.c
+$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
 
diff --git a/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile b/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile
index 1a03f78a24..bd56a9a294 100644
--- a/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_transparent_usb.makefile
@@ -4,7 +4,7 @@
 $(TARGET).CFLAGS += -DDOWNLINK -DDOWNLINK_DEVICE=usb_serial -DPPRZ_UART=usb_serial
 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=PPRZ -DUSE_USB_SERIAL
 $(TARGET).CFLAGS += -DPERIODIC_TELEMETRY
-$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/lib/pprzlink/pprz_transport.c subsystems/datalink/telemetry.c
+$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
 
 ifeq ($(ARCH), lpc21)
 $(TARGET).srcs += $(SRC_ARCH)/usb_ser_hw.c $(SRC_ARCH)/lpcusb/usbhw_lpc.c $(SRC_ARCH)/lpcusb/usbcontrol.c
diff --git a/conf/firmwares/subsystems/shared/telemetry_w5100.makefile b/conf/firmwares/subsystems/shared/telemetry_w5100.makefile
index 8693976196..11f4b1ff58 100644
--- a/conf/firmwares/subsystems/shared/telemetry_w5100.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_w5100.makefile
@@ -10,7 +10,7 @@ W5100_MULTICAST_PORT ?= "1234"
 $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=chip0
 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=pprz_tp -DDATALINK=W5100
 $(TARGET).CFLAGS += -DW5100_IP=$(W5100_IP) -DW5100_SUBNET=$(W5100_SUBNET) -DW5100_MULTICAST_IP=$(W5100_MULTICAST_IP) -DW5100_MULTICAST_PORT=$(W5100_MULTICAST_PORT)
-$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/lib/pprzlink/pprz_transport.c subsystems/datalink/telemetry.c
+$(TARGET).srcs += subsystems/datalink/downlink.c subsystems/datalink/w5100.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/pprz_transport.c subsystems/datalink/telemetry.c
 
 ifeq ($(ARCH), lpc21)
 # only an issue of setting the DRDY pin in w5100.c, which is stm32 specific
diff --git a/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile b/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile
index 593aa0f5e7..7f422aaca9 100644
--- a/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile
+++ b/conf/firmwares/subsystems/shared/telemetry_xbee_api.makefile
@@ -14,4 +14,4 @@ $(TARGET).CFLAGS += -D$(XBEE_MODEM_PORT_UPPER)_BAUD=$(MODEM_BAUD) -DXBEE_BAUD=$(
 
 $(TARGET).CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_DEVICE=$(XBEE_MODEM_PORT_LOWER) -DXBEE_UART=$(XBEE_MODEM_PORT_LOWER)
 $(TARGET).CFLAGS += -DDOWNLINK_TRANSPORT=xbee_tp -DDATALINK=XBEE
-$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/lib/pprzlink/xbee_transport.c subsystems/datalink/telemetry.c
+$(TARGET).srcs += subsystems/datalink/downlink.c $(PAPARAZZI_HOME)/var/share/pprzlink/src/xbee_transport.c subsystems/datalink/telemetry.c
diff --git a/sw/ext/pprzlink b/sw/ext/pprzlink
index 0085bf0989..b312a1c393 160000
--- a/sw/ext/pprzlink
+++ b/sw/ext/pprzlink
@@ -1 +1 @@
-Subproject commit 0085bf098986d2a362777dff51e1ded6964113d1
+Subproject commit b312a1c393c8020e8402b15793e40297890877d5