diff --git a/benchmarks/pfSense-pkg-iperf/Makefile b/benchmarks/pfSense-pkg-iperf/Makefile
index 71a2f13c62e5..2a8474d0afd1 100644
--- a/benchmarks/pfSense-pkg-iperf/Makefile
+++ b/benchmarks/pfSense-pkg-iperf/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml b/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml
index b5bf19e82540..67b36be98cbd 100644
--- a/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml
+++ b/benchmarks/pfSense-pkg-iperf/files/usr/local/share/pfSense-pkg-iperf/info.xml
@@ -4,7 +4,7 @@
 		<name>iperf</name>
 		<website>http://www.freshports.org/benchmarks/iperf/</website>
 		<descr><![CDATA[Iperf is a tool for testing network throughput, loss, and jitter.]]></descr>
-		<version>2.0.5.4</version>
+		<version>%%PKGVERSION%%</version>
 		<pkginfolink>https://doc.pfsense.org/index.php/Iperf_package</pkginfolink>
 		<configurationfile>iperf.xml</configurationfile>
 	</package>
diff --git a/emulators/pfSense-pkg-Open-VM-Tools/Makefile b/emulators/pfSense-pkg-Open-VM-Tools/Makefile
index 20997aae63a1..775833e084d4 100644
--- a/emulators/pfSense-pkg-Open-VM-Tools/Makefile
+++ b/emulators/pfSense-pkg-Open-VM-Tools/Makefile
@@ -30,5 +30,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml b/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml
index 9debea445651..ca91ddabe7f4 100644
--- a/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml
+++ b/emulators/pfSense-pkg-Open-VM-Tools/files/usr/local/share/pfSense-pkg-Open-VM-Tools/info.xml
@@ -4,7 +4,7 @@
 		<name>Open-VM-Tools</name>
 		<descr><![CDATA[VMware Tools is a suite of utilities that enhances the performance of the virtual machine's guest operating system and improves management of the virtual machine.]]></descr>
 		<website>http://open-vm-tools.sourceforge.net/</website>
-		<version>1280544.13</version>
+		<version>%%PKGVERSION%%</version>
 		<pkginfolink>https://doc.pfsense.org/index.php/Open_VM_Tools_package</pkginfolink>
 		<configurationfile>open-vm-tools.xml</configurationfile>
 	</package>
diff --git a/ftp/pfSense-pkg-FTP_Client_Proxy/Makefile b/ftp/pfSense-pkg-FTP_Client_Proxy/Makefile
index f138bd8d86fe..bed79121b63e 100644
--- a/ftp/pfSense-pkg-FTP_Client_Proxy/Makefile
+++ b/ftp/pfSense-pkg-FTP_Client_Proxy/Makefile
@@ -31,5 +31,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml b/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml
index e931d1de8a9d..8b4b6c89371e 100644
--- a/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml
+++ b/ftp/pfSense-pkg-FTP_Client_Proxy/files/usr/local/share/pfSense-pkg-FTP_Client_Proxy/info.xml
@@ -5,7 +5,7 @@
 		<internal_name>FTP_Client_Proxy</internal_name>
 		<descr><![CDATA[Basic FTP Client Proxy using ftp-proxy from FreeBSD.]]></descr>
 		<pkginfolink>https://forum.pfsense.org/index.php?topic=89841.0</pkginfolink>
-		<version>0.3</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>ftpproxy.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/mail/pfSense-pkg-mailreport/Makefile b/mail/pfSense-pkg-mailreport/Makefile
index 56f84d7f3534..80518aeb3a1e 100644
--- a/mail/pfSense-pkg-mailreport/Makefile
+++ b/mail/pfSense-pkg-mailreport/Makefile
@@ -53,5 +53,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml b/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml
index 7b8ac41f913d..d803f97cd4ff 100644
--- a/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml
+++ b/mail/pfSense-pkg-mailreport/files/usr/local/share/pfSense-pkg-mailreport/info.xml
@@ -3,7 +3,7 @@
 	<package>
 		<name>mailreport</name>
 		<descr><![CDATA[Allows you to setup periodic e-mail reports containing command output, log file contents, and RRD graphs.]]></descr>
-		<version>2.4.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>mailreport.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net-mgmt/pfSense-pkg-darkstat/Makefile b/net-mgmt/pfSense-pkg-darkstat/Makefile
index 81266decb8f2..2c5c953e6aba 100644
--- a/net-mgmt/pfSense-pkg-darkstat/Makefile
+++ b/net-mgmt/pfSense-pkg-darkstat/Makefile
@@ -31,5 +31,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml b/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml
index 9773fffbf33c..eea5390c03cd 100644
--- a/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml
+++ b/net-mgmt/pfSense-pkg-darkstat/files/usr/local/share/pfSense-pkg-darkstat/info.xml
@@ -4,7 +4,7 @@
 		<name>darkstat</name>
 		<website>http://dmr.ath.cx/net/darkstat/</website>
 		<descr><![CDATA[darkstat is a network statistics gatherer. It's a packet sniffer that runs as a background process on a cable/DSL router, gathers all sorts of statistics about network usage, and serves them over HTTP.]]></descr>
-		<version>3.1.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>darkstat.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net-mgmt/pfSense-pkg-iftop/Makefile b/net-mgmt/pfSense-pkg-iftop/Makefile
index 4e7fc5e07022..53ddbceeb31e 100644
--- a/net-mgmt/pfSense-pkg-iftop/Makefile
+++ b/net-mgmt/pfSense-pkg-iftop/Makefile
@@ -28,5 +28,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml b/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml
index 1ab3c184b2a1..205b3fcb9952 100644
--- a/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml
+++ b/net-mgmt/pfSense-pkg-iftop/files/usr/local/share/pfSense-pkg-iftop/info.xml
@@ -5,7 +5,7 @@
 		<pkginfolink>https://forum.pfsense.org/</pkginfolink>
 		<descr><![CDATA[Realtime interface monitor (console/shell only).]]></descr>
 		<website>http://www.ex-parrot.com/~pdw/iftop/</website>
-		<version>0.17</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>iftop.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net-mgmt/pfSense-pkg-softflowd/Makefile b/net-mgmt/pfSense-pkg-softflowd/Makefile
index 7f96b71efbd9..3d3d3d8439e2 100644
--- a/net-mgmt/pfSense-pkg-softflowd/Makefile
+++ b/net-mgmt/pfSense-pkg-softflowd/Makefile
@@ -28,5 +28,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml b/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml
index ecdf0c096ec2..4cdb7859e6d9 100644
--- a/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml
+++ b/net-mgmt/pfSense-pkg-softflowd/files/usr/local/share/pfSense-pkg-softflowd/info.xml
@@ -6,7 +6,7 @@
 		<descr><![CDATA[Softflowd is flow-based network traffic analyser capable of Cisco NetFlow data export.&lt;br/&gt;
 			Softflowd semi-statefully tracks traffic flows recorded by listening on a network interface or by reading a packet capture file. These flows may be reported via NetFlow to a collecting host or summarised within softflowd itself.&lt;br/&gt;
 			Softflowd supports Netflow versions 1, 5 and 9 and is fully IPv6-capable - it can track IPv6 flows and send export datagrams via IPv6. It also supports export to multicast groups, allowing for redundant flow collectors.&lt;br/&gt;]]></descr>
-		<version>1.2.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>softflowd.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net-mgmt/pfSense-pkg-zabbix-agent/Makefile b/net-mgmt/pfSense-pkg-zabbix-agent/Makefile
index 83d27066f9d0..b3e976c35fb9 100644
--- a/net-mgmt/pfSense-pkg-zabbix-agent/Makefile
+++ b/net-mgmt/pfSense-pkg-zabbix-agent/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/share/pfSense-pkg-zabbix-agent/info.xml b/net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/share/pfSense-pkg-zabbix-agent/info.xml
index aab40083a840..b5f8d6f59394 100644
--- a/net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/share/pfSense-pkg-zabbix-agent/info.xml
+++ b/net-mgmt/pfSense-pkg-zabbix-agent/files/usr/local/share/pfSense-pkg-zabbix-agent/info.xml
@@ -9,7 +9,7 @@
 			will result in change of the first version number.&lt;br /&gt;
 			More info in &lt;a href=&quot;http://www.zabbix.com/life_cycle_and_release_policy.php&quot;&gt;Zabbix Life Cycle and Release Policy&lt;/a&gt;.]]></descr>
 		<website>http://www.zabbix.com/product.php</website>
-		<version>0.8.9</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>zabbix-agent-lts.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net-mgmt/pfSense-pkg-zabbix-proxy/Makefile b/net-mgmt/pfSense-pkg-zabbix-proxy/Makefile
index 9c6a499267f1..cef6cd914c3b 100644
--- a/net-mgmt/pfSense-pkg-zabbix-proxy/Makefile
+++ b/net-mgmt/pfSense-pkg-zabbix-proxy/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/pfSense-pkg-zabbix-proxy/files/usr/local/share/pfSense-pkg-zabbix-proxy/info.xml b/net-mgmt/pfSense-pkg-zabbix-proxy/files/usr/local/share/pfSense-pkg-zabbix-proxy/info.xml
index 7653171817aa..dfc655fdcfe6 100644
--- a/net-mgmt/pfSense-pkg-zabbix-proxy/files/usr/local/share/pfSense-pkg-zabbix-proxy/info.xml
+++ b/net-mgmt/pfSense-pkg-zabbix-proxy/files/usr/local/share/pfSense-pkg-zabbix-proxy/info.xml
@@ -9,7 +9,7 @@
 			will result in change of the first version number.&lt;br /&gt;
 			More info in &lt;a href=&quot;http://www.zabbix.com/life_cycle_and_release_policy.php&quot;&gt;Zabbix Life Cycle and Release Policy&lt;/a&gt;.]]></descr>
 		<website>http://www.zabbix.com/product.php</website>
-		<version>0.8.9</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>zabbix-proxy-lts.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-Avahi/Makefile b/net/pfSense-pkg-Avahi/Makefile
index 38cf5bf8a428..55272d2bc69d 100644
--- a/net/pfSense-pkg-Avahi/Makefile
+++ b/net/pfSense-pkg-Avahi/Makefile
@@ -38,5 +38,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/etc/avahi
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml b/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml
index 2c00fd6a0fb3..9e808cf882eb 100644
--- a/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml
+++ b/net/pfSense-pkg-Avahi/files/usr/local/share/pfSense-pkg-Avahi/info.xml
@@ -8,7 +8,7 @@
 			This enables you to plug your laptop or computer into a network and instantly be able to view other people who you can chat with, find printers to print to or find files being shared.&lt;br/&gt;
 			In addition it supports some nifty things that have never been seen elsewhere like correct mDNS reflection across LAN segments.&lt;br/&gt;
 			Compatible technology is found in Apple MacOS X (branded ​Bonjour and sometimes Zeroconf).]]></descr>
-		<version>1.10.4</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>avahi.xml</configurationfile>
 		<after_install_info>Please visit Services - Avahi menu, enable the service and select which interfaces you do NOT wish Avahi to listen on. Save settings to start the service.</after_install_info>
 	</package>
diff --git a/net/pfSense-pkg-LADVD/Makefile b/net/pfSense-pkg-LADVD/Makefile
index 378cf7de6e1c..10d12cef4515 100644
--- a/net/pfSense-pkg-LADVD/Makefile
+++ b/net/pfSense-pkg-LADVD/Makefile
@@ -36,5 +36,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-LADVD/files/usr/local/share/pfSense-pkg-LADVD/info.xml b/net/pfSense-pkg-LADVD/files/usr/local/share/pfSense-pkg-LADVD/info.xml
index 24478565f295..7ac7c680dced 100644
--- a/net/pfSense-pkg-LADVD/files/usr/local/share/pfSense-pkg-LADVD/info.xml
+++ b/net/pfSense-pkg-LADVD/files/usr/local/share/pfSense-pkg-LADVD/info.xml
@@ -4,7 +4,7 @@
 		<name>LADVD</name>
 		<descr><![CDATA[Send and decode link layer advertisements. Support for LLDP (Link Layer Discovery Protocol), CDP (Cisco Discovery Protocol), EDP (Extreme Discovery Protocol) and NDP (Nortel Discovery Protocol).]]></descr>
 		<website>https://github.com/sspans/ladvd</website>
-		<version>1.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>ladvd.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-OpenBGPD/Makefile b/net/pfSense-pkg-OpenBGPD/Makefile
index f358deb342a3..ace85759b841 100644
--- a/net/pfSense-pkg-OpenBGPD/Makefile
+++ b/net/pfSense-pkg-OpenBGPD/Makefile
@@ -44,5 +44,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml b/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml
index 1755c53c392b..36b2db6e638c 100644
--- a/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml
+++ b/net/pfSense-pkg-OpenBGPD/files/usr/local/share/pfSense-pkg-OpenBGPD/info.xml
@@ -4,7 +4,7 @@
 		<name>OpenBGPD</name>
 		<descr><![CDATA[OpenBGPD is a free implementation of the Border Gateway Protocol, version 4. It allows ordinary machines to be used as routers exchanging routes with other systems speaking the BGP protocol.&lt;br /&gt;
 			&lt;strong&gt;WARNING! Installs files to the same place as Quagga OSPF. Installing both will result in a broken state, remove this package before installing Quagga OSPF.&lt;/strong&gt;]]></descr>
-		<version>0.11</version>
+		<version>%%PKGVERSION%%</version>
 		<pkginfolink>https://doc.pfsense.org/index.php/OpenBGPD_package</pkginfolink>
 		<configurationfile>openbgpd.xml</configurationfile>
 	</package>
diff --git a/net/pfSense-pkg-Quagga_OSPF/Makefile b/net/pfSense-pkg-Quagga_OSPF/Makefile
index 0c1fc8967695..67a4cf73ac64 100644
--- a/net/pfSense-pkg-Quagga_OSPF/Makefile
+++ b/net/pfSense-pkg-Quagga_OSPF/Makefile
@@ -45,5 +45,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml
index 57ad4cabd548..79fea9e69f4e 100644
--- a/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml
+++ b/net/pfSense-pkg-Quagga_OSPF/files/usr/local/share/pfSense-pkg-Quagga_OSPF/info.xml
@@ -5,7 +5,7 @@
 		<internal_name>Quagga_OSPF</internal_name>
 		<descr><![CDATA[OSPF routing protocol using Quagga.&lt;br /&gt;
 			&lt;strong&gt;WARNING! Installs files to the same place as OpenBGPD. Installing both will break things.&lt;/strong&gt;]]></descr>
-		<version>0.6.12</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>quagga_ospfd.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-arping/Makefile b/net/pfSense-pkg-arping/Makefile
index 667958428cf2..b2f943615422 100644
--- a/net/pfSense-pkg-arping/Makefile
+++ b/net/pfSense-pkg-arping/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml b/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml
index 7871a971ed38..03e85f88f016 100644
--- a/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml
+++ b/net/pfSense-pkg-arping/files/usr/local/share/pfSense-pkg-arping/info.xml
@@ -4,7 +4,7 @@
 		<name>arping</name>
 		<descr><![CDATA[Broadcasts a who-has ARP packet on the network and prints answers.]]></descr>
 		<website>http://www.habets.pp.se/synscan/programs.php?prog=arping</website>
-		<version>1.2.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>arping.xml</configurationfile>
 		<pkginfolink>https://doc.pfsense.org/index.php/Arping</pkginfolink>
 	</package>
diff --git a/net/pfSense-pkg-freeradius2/Makefile b/net/pfSense-pkg-freeradius2/Makefile
index f586637facd3..ff1caffb62fa 100644
--- a/net/pfSense-pkg-freeradius2/Makefile
+++ b/net/pfSense-pkg-freeradius2/Makefile
@@ -55,5 +55,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml b/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml
index 80a3e091a1d7..a6403b40f8ed 100644
--- a/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml
+++ b/net/pfSense-pkg-freeradius2/files/usr/local/share/pfSense-pkg-freeradius2/info.xml
@@ -8,7 +8,7 @@
 			FreeRADIUS and FreeRADIUS2 settings are not compatible so don't use them together or try to update.&lt;br /&gt;
 			On pfSense docs there is a how-to which could help you on porting users.]]></descr>
 		<pkginfolink>https://doc.pfsense.org/index.php/FreeRADIUS_2.x_package</pkginfolink>
-		<version>1.7</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>freeradius.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-haproxy-devel/Makefile b/net/pfSense-pkg-haproxy-devel/Makefile
index b7cf10951985..f9f2b1314ea8 100644
--- a/net/pfSense-pkg-haproxy-devel/Makefile
+++ b/net/pfSense-pkg-haproxy-devel/Makefile
@@ -82,5 +82,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml b/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml
index 8f66b824b5f9..fe2d8bc75107 100644
--- a/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml
+++ b/net/pfSense-pkg-haproxy-devel/files/usr/local/share/pfSense-pkg-haproxy-devel/info.xml
@@ -8,7 +8,7 @@
 			Supports ACLs for smart backend switching.&lt;br /&gt;
 			&lt;strong&gt;As of pkg v0.33 switched to using 1.6 stable releases.&lt;/strong&gt;]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
-		<version>0.39</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>haproxy.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-haproxy/Makefile b/net/pfSense-pkg-haproxy/Makefile
index 80223d0a6a8c..27b8e826f388 100644
--- a/net/pfSense-pkg-haproxy/Makefile
+++ b/net/pfSense-pkg-haproxy/Makefile
@@ -70,5 +70,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www/javascript
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml b/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml
index ed815ed75348..f8e9087e6bc3 100644
--- a/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml
+++ b/net/pfSense-pkg-haproxy/files/usr/local/share/pfSense-pkg-haproxy/info.xml
@@ -8,7 +8,7 @@
 			This package implements the TCP, HTTP and HTTPS balancing features from haproxy.&lt;br /&gt;
 			Supports ACLs for smart backend switching.]]></descr>
 		<website>http://haproxy.1wt.eu/</website>
-		<version>0.33</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>haproxy.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-mtr-nox11/Makefile b/net/pfSense-pkg-mtr-nox11/Makefile
index d8af5e7609a7..48d1d0ace87a 100644
--- a/net/pfSense-pkg-mtr-nox11/Makefile
+++ b/net/pfSense-pkg-mtr-nox11/Makefile
@@ -31,5 +31,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml b/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml
index a062b3fa0d8d..2b364d6b9127 100644
--- a/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml
+++ b/net/pfSense-pkg-mtr-nox11/files/usr/local/share/pfSense-pkg-mtr-nox11/info.xml
@@ -4,7 +4,7 @@
 		<name>mtr-nox11</name>
 		<descr><![CDATA[Enhanced traceroute replacement. mtr combines the functionality of the traceroute and ping programs in a single network diagnostic tool.]]></descr>
 		<website>http://www.bitwizard.nl/mtr/</website>
-		<version>0.85.4</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>mtr-nox11.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-ntopng/Makefile b/net/pfSense-pkg-ntopng/Makefile
index c0ff2c7fa39d..a48fb84d2acd 100644
--- a/net/pfSense-pkg-ntopng/Makefile
+++ b/net/pfSense-pkg-ntopng/Makefile
@@ -39,5 +39,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-ntopng/files/usr/local/share/pfSense-pkg-ntopng/info.xml b/net/pfSense-pkg-ntopng/files/usr/local/share/pfSense-pkg-ntopng/info.xml
index 55ed4a9206a0..1fb6ddc247be 100644
--- a/net/pfSense-pkg-ntopng/files/usr/local/share/pfSense-pkg-ntopng/info.xml
+++ b/net/pfSense-pkg-ntopng/files/usr/local/share/pfSense-pkg-ntopng/info.xml
@@ -4,7 +4,7 @@
 		<name>ntopng</name>
 		<website>http://www.ntop.org/</website>
 		<descr><![CDATA[ntopng (replaces ntop) is a network probe that shows network usage in a way similar to what top does for processes. In interactive mode, it displays the network status on the user's terminal. In Web mode it acts as a Web server, creating an HTML dump of the network status. It sports a NetFlow/sFlow emitter/collector, an HTTP-based client interface for creating ntop-centric monitoring applications, and RRD for persistently storing traffic statistics.]]></descr>
-		<version>0.8.3</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>ntopng.xml</configurationfile>
 		<noembedded>true</noembedded>
 	</package>
diff --git a/net/pfSense-pkg-pfBlockerNG/Makefile b/net/pfSense-pkg-pfBlockerNG/Makefile
index 90d69bc97817..6bd6c004aa2e 100644
--- a/net/pfSense-pkg-pfBlockerNG/Makefile
+++ b/net/pfSense-pkg-pfBlockerNG/Makefile
@@ -84,5 +84,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www/pfblockerng/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml b/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml
index 0f6c2d617625..a209084d7040 100644
--- a/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml
+++ b/net/pfSense-pkg-pfBlockerNG/files/usr/local/share/pfSense-pkg-pfBlockerNG/info.xml
@@ -10,7 +10,7 @@
 			Advanced Integration for Proofpoint ET IQRisk IP Reputation Threat Sources.&lt;br /&gt;
 			Domain Name (DNSBL) blocking via Unbound DNS Resolver.]]></descr>
 		<pkginfolink>https://forum.pfsense.org/index.php?topic=102470.0</pkginfolink>
-		<version>2.0.6</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>pfblockerng.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-routed/Makefile b/net/pfSense-pkg-routed/Makefile
index 91dbf1580ae3..d6bd36fb1cb1 100644
--- a/net/pfSense-pkg-routed/Makefile
+++ b/net/pfSense-pkg-routed/Makefile
@@ -31,5 +31,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml b/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml
index d8f47b84d87e..8438626a883b 100644
--- a/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml
+++ b/net/pfSense-pkg-routed/files/usr/local/share/pfSense-pkg-routed/info.xml
@@ -4,7 +4,7 @@
 		<name>routed</name>
 		<website>https://packages.pfsense.org/</website>
 		<descr><![CDATA[RIP v1 and v2 daemon.]]></descr>
-		<version>1.2.3</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>routed.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/net/pfSense-pkg-siproxd/Makefile b/net/pfSense-pkg-siproxd/Makefile
index e2ad45f7f718..922643dbbe03 100644
--- a/net/pfSense-pkg-siproxd/Makefile
+++ b/net/pfSense-pkg-siproxd/Makefile
@@ -38,5 +38,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml b/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml
index bfd39a0e9677..2ca7f4932a38 100644
--- a/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml
+++ b/net/pfSense-pkg-siproxd/files/usr/local/share/pfSense-pkg-siproxd/info.xml
@@ -5,7 +5,7 @@
 		<website>http://siproxd.sourceforge.net/</website>
 		<descr><![CDATA[Proxy for handling NAT of multiple SIP devices to a single public IP.]]></descr>
 		<pkginfolink>https://doc.pfsense.org/index.php/Siproxd_package</pkginfolink>
-		<version>1.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>siproxd.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/security/pfSense-pkg-nmap/Makefile b/security/pfSense-pkg-nmap/Makefile
index c4ecad2dac15..c442d7e89d28 100644
--- a/security/pfSense-pkg-nmap/Makefile
+++ b/security/pfSense-pkg-nmap/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml b/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml
index dc6acc87927a..a881168e1d65 100644
--- a/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml
+++ b/security/pfSense-pkg-nmap/files/usr/local/share/pfSense-pkg-nmap/info.xml
@@ -5,7 +5,7 @@
 		<descr><![CDATA[NMap is a utility for network exploration or security auditing.&lt;br/&gt;
 			It supports ping scanning (determine which hosts are up), many port scanning techniques (determine what services the hosts are offering), version detection (determine what application/service is running on a port), and TCP/IP fingerprinting (remote host OS or device identification).
 			It also offers flexible target and port specification, decoy/stealth scanning, SunRPC scanning, and more.]]></descr>
-		<version>1.4.2</version>
+		<version>%%PKGVERSION%%</version>
 		<pkginfolink>https://doc.pfsense.org/index.php/Nmap_package</pkginfolink>
 		<configurationfile>nmap.xml</configurationfile>
 	</package>
diff --git a/security/pfSense-pkg-openvpn-client-export/Makefile b/security/pfSense-pkg-openvpn-client-export/Makefile
index 9cbe185a2ac5..fe82585dee89 100644
--- a/security/pfSense-pkg-openvpn-client-export/Makefile
+++ b/security/pfSense-pkg-openvpn-client-export/Makefile
@@ -40,5 +40,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml b/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml
index 5e1d7c6a1b8f..510b7b824752 100644
--- a/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml
+++ b/security/pfSense-pkg-openvpn-client-export/files/usr/local/share/pfSense-pkg-openvpn-client-export/info.xml
@@ -4,7 +4,7 @@
 		<name>OpenVPN Client Export Utility</name>
 		<internal_name>openvpn-client-export</internal_name>
 		<descr><![CDATA[Allows a pre-configured OpenVPN Windows Client or Mac OS X's Viscosity configuration bundle to be exported directly from pfSense.]]></descr>
-		<version>1.3.6</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>openvpn-client-export.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/security/pfSense-pkg-snort/Makefile b/security/pfSense-pkg-snort/Makefile
index 32db61d314b1..3798ce1ba022 100644
--- a/security/pfSense-pkg-snort/Makefile
+++ b/security/pfSense-pkg-snort/Makefile
@@ -135,5 +135,7 @@ do-install:
 		${STAGEDIR}/var/db/snort/sidmods
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml b/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml
index 456f16fd92e7..7ce461fe03a8 100644
--- a/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml
+++ b/security/pfSense-pkg-snort/files/usr/local/share/pfSense-pkg-snort/info.xml
@@ -5,7 +5,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Setup_Snort_Package</pkginfolink>
 		<website>http://www.snort.org</website>
 		<descr><![CDATA[Snort is an open source network intrusion prevention and detection system (IDS/IPS). Combining the benefits of signature, protocol, and anomaly-based inspection.]]></descr>
-		<version>3.2.9.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>/snort.xml</configurationfile>
 		<after_install_info>Please visit Services - Snort - Interfaces tab first and select your desired rules. Afterwards visit the Updates tab to download your configured rulesets.</after_install_info>
 	</package>
diff --git a/security/pfSense-pkg-sudo/Makefile b/security/pfSense-pkg-sudo/Makefile
index 70ec9fb4f614..5d2d50e7902b 100644
--- a/security/pfSense-pkg-sudo/Makefile
+++ b/security/pfSense-pkg-sudo/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml b/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml
index 017387744faa..efd447535556 100644
--- a/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml
+++ b/security/pfSense-pkg-sudo/files/usr/local/share/pfSense-pkg-sudo/info.xml
@@ -5,7 +5,7 @@
 		<pkginfolink>https://doc.pfsense.org/index.php/Sudo_Package</pkginfolink>
 		<descr><![CDATA[sudo allows delegation of privileges to users in the shell so commands can be run as other users, such as root.]]></descr>
 		<website>http://www.sudo.ws/</website>
-		<version>0.2.9</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>sudo.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/security/pfSense-pkg-suricata/Makefile b/security/pfSense-pkg-suricata/Makefile
index 78fcd7a66f63..49ba40a958e9 100644
--- a/security/pfSense-pkg-suricata/Makefile
+++ b/security/pfSense-pkg-suricata/Makefile
@@ -135,5 +135,7 @@ do-install:
 		${STAGEDIR}/var/db/suricata/sidmods
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml b/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml
index 49b9f93f5851..96790cdcc3e5 100644
--- a/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml
+++ b/security/pfSense-pkg-suricata/files/usr/local/share/pfSense-pkg-suricata/info.xml
@@ -4,7 +4,7 @@
 		<name>suricata</name>
 		<website>http://suricata-ids.org/</website>
 		<descr><![CDATA[High Performance Network IDS, IPS and Security Monitoring engine by OISF.]]></descr>
-		<version>2.1.9.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>suricata.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-AutoConfigBackup/Makefile b/sysutils/pfSense-pkg-AutoConfigBackup/Makefile
index 0b8cf1d21a02..21db83747342 100644
--- a/sysutils/pfSense-pkg-AutoConfigBackup/Makefile
+++ b/sysutils/pfSense-pkg-AutoConfigBackup/Makefile
@@ -41,5 +41,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml b/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml
index 438a7fb2f2fe..32f0c817972f 100644
--- a/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml
+++ b/sysutils/pfSense-pkg-AutoConfigBackup/files/usr/local/share/pfSense-pkg-AutoConfigBackup/info.xml
@@ -5,7 +5,7 @@
 		<descr><![CDATA[Automatically backs up your pfSense configuration. All contents are encrypted before being sent to the server.&lt;br /&gt;
 			Requires Gold Subscription from &lt;a href=&quot;https://portal.pfsense.org&quot;&gt;pfSense Portal&lt;/a&gt;.]]></descr>
 		<website>https://portal.pfsense.org</website>
-		<version>1.42</version>
+		<version>%%PKGVERSION%%</version>
 		<pkginfolink>https://doc.pfsense.org/index.php/AutoConfigBackup</pkginfolink>
 		<configurationfile>autoconfigbackup.xml</configurationfile>
 	</package>
diff --git a/sysutils/pfSense-pkg-Backup/Makefile b/sysutils/pfSense-pkg-Backup/Makefile
index 6e7f62596695..7e2bee3f4a96 100644
--- a/sysutils/pfSense-pkg-Backup/Makefile
+++ b/sysutils/pfSense-pkg-Backup/Makefile
@@ -36,5 +36,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www/packages/backup
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml b/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml
index 0e3907739c65..9e13c90dd954 100644
--- a/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml
+++ b/sysutils/pfSense-pkg-Backup/files/usr/local/share/pfSense-pkg-Backup/info.xml
@@ -3,7 +3,7 @@
 	<package>
 		<name>Backup</name>
 		<descr><![CDATA[Tool to Backup and Restore files and directories.]]></descr>
-		<version>0.3</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>backup.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-Cron/Makefile b/sysutils/pfSense-pkg-Cron/Makefile
index 3fd76f4c048f..ff1f03889c39 100644
--- a/sysutils/pfSense-pkg-Cron/Makefile
+++ b/sysutils/pfSense-pkg-Cron/Makefile
@@ -40,5 +40,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www/packages/cron
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml b/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml
index 9551fe69d094..82e3e30fc695 100644
--- a/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml
+++ b/sysutils/pfSense-pkg-Cron/files/usr/local/share/pfSense-pkg-Cron/info.xml
@@ -3,7 +3,7 @@
 	<package>
 		<name>Cron</name>
 		<descr><![CDATA[The cron utility is used to manage commands on a schedule.]]></descr>
-		<version>0.3.6</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>cron.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-Notes/Makefile b/sysutils/pfSense-pkg-Notes/Makefile
index 453735aee287..27a948f39d53 100644
--- a/sysutils/pfSense-pkg-Notes/Makefile
+++ b/sysutils/pfSense-pkg-Notes/Makefile
@@ -29,5 +29,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml b/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml
index b5985e0aaf9b..64bcedfd9578 100644
--- a/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml
+++ b/sysutils/pfSense-pkg-Notes/files/usr/local/share/pfSense-pkg-Notes/info.xml
@@ -4,7 +4,7 @@
 		<name>Notes</name>
 		<descr><![CDATA[Track things you want to note for this system.]]></descr>
 		<pkginfolink/>
-		<version>0.2.8</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>notes.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-RRD_Summary/Makefile b/sysutils/pfSense-pkg-RRD_Summary/Makefile
index 91f99cd34d4c..23032d59f593 100644
--- a/sysutils/pfSense-pkg-RRD_Summary/Makefile
+++ b/sysutils/pfSense-pkg-RRD_Summary/Makefile
@@ -32,5 +32,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml b/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml
index 3ee3d627b41e..d96239bf18be 100644
--- a/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml
+++ b/sysutils/pfSense-pkg-RRD_Summary/files/usr/local/share/pfSense-pkg-RRD_Summary/info.xml
@@ -4,7 +4,7 @@
 		<name>RRD Summary</name>
 		<internal_name>RRD_Summary</internal_name>
 		<descr><![CDATA[RRD Summary Page, which will give a total amount of traffic passed In/Out during this and the previous month.]]></descr>
-		<version>1.3.1</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>rrd-summary.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-Service_Watchdog/Makefile b/sysutils/pfSense-pkg-Service_Watchdog/Makefile
index d1ec10c053ad..e5e2a572e326 100644
--- a/sysutils/pfSense-pkg-Service_Watchdog/Makefile
+++ b/sysutils/pfSense-pkg-Service_Watchdog/Makefile
@@ -35,5 +35,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml b/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml
index b985ede70b47..a3869b02689d 100644
--- a/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml
+++ b/sysutils/pfSense-pkg-Service_Watchdog/files/usr/local/share/pfSense-pkg-Service_Watchdog/info.xml
@@ -4,7 +4,7 @@
 		<name>Service Watchdog</name>
 		<internal_name>Service_Watchdog</internal_name>
 		<descr><![CDATA[Monitors for stopped services and restarts them.]]></descr>
-		<version>1.8.2</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>servicewatchdog.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-Shellcmd/Makefile b/sysutils/pfSense-pkg-Shellcmd/Makefile
index e44d4a692b17..93c8e06dc6eb 100644
--- a/sysutils/pfSense-pkg-Shellcmd/Makefile
+++ b/sysutils/pfSense-pkg-Shellcmd/Makefile
@@ -31,5 +31,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml b/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml
index 25443480863f..23040e17f175 100644
--- a/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml
+++ b/sysutils/pfSense-pkg-Shellcmd/files/usr/local/share/pfSense-pkg-Shellcmd/info.xml
@@ -3,7 +3,7 @@
 	<package>
 		<name>Shellcmd</name>
 		<descr><![CDATA[The shellcmd utility is used to manage commands on system startup.]]></descr>
-		<version>1.0.2</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>shellcmd.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-System_Patches/Makefile b/sysutils/pfSense-pkg-System_Patches/Makefile
index 527a3c402b33..583edad21be8 100644
--- a/sysutils/pfSense-pkg-System_Patches/Makefile
+++ b/sysutils/pfSense-pkg-System_Patches/Makefile
@@ -36,5 +36,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-System_Patches/files/usr/local/share/pfSense-pkg-System_Patches/info.xml b/sysutils/pfSense-pkg-System_Patches/files/usr/local/share/pfSense-pkg-System_Patches/info.xml
index 529383a3cf5c..c4b5bf39f06e 100644
--- a/sysutils/pfSense-pkg-System_Patches/files/usr/local/share/pfSense-pkg-System_Patches/info.xml
+++ b/sysutils/pfSense-pkg-System_Patches/files/usr/local/share/pfSense-pkg-System_Patches/info.xml
@@ -4,7 +4,7 @@
 		<name>System Patches</name>
 		<internal_name>System_Patches</internal_name>
 		<descr><![CDATA[A package to apply and maintain custom system patches.]]></descr>
-		<version>1.1.3</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>systempatches.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-blinkled/Makefile b/sysutils/pfSense-pkg-blinkled/Makefile
index 27bf0722b665..1703a9556f07 100644
--- a/sysutils/pfSense-pkg-blinkled/Makefile
+++ b/sysutils/pfSense-pkg-blinkled/Makefile
@@ -33,5 +33,7 @@ do-install:
 		${STAGEDIR}/etc/inc/priv
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml b/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml
index b94f74bc1907..4819cc08333b 100644
--- a/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml
+++ b/sysutils/pfSense-pkg-blinkled/files/usr/local/share/pfSense-pkg-blinkled/info.xml
@@ -3,7 +3,7 @@
 	<package>
 		<name>blinkled</name>
 		<descr><![CDATA[Allows you to use LEDs for monitoring network activity on supported platforms (ALIX, WRAP, Soekris, etc.)]]></descr>
-		<version>0.4.6</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>blinkled.xml</configurationfile>
 		<pkginfolink>https://doc.pfsense.org/index.php/BlinkLED_Package</pkginfolink>
 		<website>https://doc.pfsense.org/index.php/BlinkLED_Package</website>
diff --git a/sysutils/pfSense-pkg-gwled/Makefile b/sysutils/pfSense-pkg-gwled/Makefile
index df5080488a13..60b7ae39b5b9 100644
--- a/sysutils/pfSense-pkg-gwled/Makefile
+++ b/sysutils/pfSense-pkg-gwled/Makefile
@@ -34,5 +34,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml b/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml
index 51612276f82a..cb1f319e3352 100644
--- a/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml
+++ b/sysutils/pfSense-pkg-gwled/files/usr/local/share/pfSense-pkg-gwled/info.xml
@@ -3,7 +3,7 @@
 	<package>
 		<name>gwled</name>
 		<descr><![CDATA[Allows you to use LEDs for monitoring gateway status on supported platforms (ALIX, WRAP, Soekris, etc.)]]></descr>
-		<version>0.2.3</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>gwled.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/sysutils/pfSense-pkg-syslog-ng/Makefile b/sysutils/pfSense-pkg-syslog-ng/Makefile
index 8d96d9cf6ca6..af7c308f9783 100644
--- a/sysutils/pfSense-pkg-syslog-ng/Makefile
+++ b/sysutils/pfSense-pkg-syslog-ng/Makefile
@@ -38,5 +38,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml
index c9fceef82233..f05a00e203a7 100644
--- a/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml
+++ b/sysutils/pfSense-pkg-syslog-ng/files/usr/local/share/pfSense-pkg-syslog-ng/info.xml
@@ -4,7 +4,7 @@
 		<name>syslog-ng</name>
 		<website>http://www.balabit.com/network-security/syslog-ng/</website>
 		<descr><![CDATA[Syslog-ng syslog server. This service is not intended to replace the default pfSense syslog server but rather acts as an independent syslog server.]]></descr>
-		<version>1.1.2</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>syslog-ng.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/www/pfSense-pkg-Lightsquid/Makefile b/www/pfSense-pkg-Lightsquid/Makefile
index 7e36b3b2310d..8e02e119b3aa 100644
--- a/www/pfSense-pkg-Lightsquid/Makefile
+++ b/www/pfSense-pkg-Lightsquid/Makefile
@@ -124,5 +124,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/share/lightsquid/tpl/novosea
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml b/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml
index 740d560484cb..e2362b563fc3 100644
--- a/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml
+++ b/www/pfSense-pkg-Lightsquid/files/usr/local/share/pfSense-pkg-Lightsquid/info.xml
@@ -5,7 +5,7 @@
 		<descr><![CDATA[LightSquid is a high performance web proxy reporting tool. Includes proxy realtime statistics (SQStat).
 			&lt;strong&gt;Requires Squid3 package.&lt;/strong&gt;]]></descr>
 		<website>http://lightsquid.sf.net/</website>
-		<version>2.5</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>lightsquid.xml</configurationfile>
 		<noembedded>true</noembedded>
 	</package>
diff --git a/www/pfSense-pkg-squid/Makefile b/www/pfSense-pkg-squid/Makefile
index 8425126f8412..a2a0d891f829 100644
--- a/www/pfSense-pkg-squid/Makefile
+++ b/www/pfSense-pkg-squid/Makefile
@@ -93,5 +93,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/pkg
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml b/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml
index 5b4658b5ee6e..4272f691070a 100644
--- a/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml
+++ b/www/pfSense-pkg-squid/files/usr/local/share/pfSense-pkg-squid/info.xml
@@ -8,7 +8,7 @@
 			&lt;strong&gt;WARNING! This package bundles ClamAV that conflicts with 'Dansguardian', 'Mailscanner' and 'HAVP antivirus' packages! Installing these will result in a broken state.&lt;/strong&gt;]]></descr>
 		<pkginfolink>https://forum.pfsense.org/index.php?topic=100167.0</pkginfolink>
 		<website>http://www.squid-cache.org/</website>
-		<version>0.4.11</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>squid.xml</configurationfile>
 	</package>
 </pfsensepkgs>
diff --git a/www/pfSense-pkg-squidGuard/Makefile b/www/pfSense-pkg-squidGuard/Makefile
index a8512fe82b96..2565090dd3f4 100644
--- a/www/pfSense-pkg-squidGuard/Makefile
+++ b/www/pfSense-pkg-squidGuard/Makefile
@@ -55,5 +55,7 @@ do-install:
 		${STAGEDIR}${PREFIX}/www
 	${INSTALL_DATA} ${FILESDIR}${DATADIR}/info.xml \
 		${STAGEDIR}${DATADIR}
+	@${REINPLACE_CMD} -i '' -e "s|%%PKGVERSION%%|${PKGVERSION}|" \
+		${STAGEDIR}${DATADIR}/info.xml
 
 .include <bsd.port.mk>
diff --git a/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml b/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml
index c0af0bfc9563..a005d352a854 100644
--- a/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml
+++ b/www/pfSense-pkg-squidGuard/files/usr/local/share/pfSense-pkg-squidGuard/info.xml
@@ -5,7 +5,7 @@
 		<descr><![CDATA[High performance web proxy URL filter.&lt;br/&gt;
 			&lt;strong&gt;Works with both Squid (2.7 legacy branch) and Squid3 (3.4 branch) packages.&lt;/strong&gt;]]></descr>
 		<website>http://www.squidGuard.org/</website>
-		<version>1.11</version>
+		<version>%%PKGVERSION%%</version>
 		<configurationfile>squidguard.xml</configurationfile>
 		<after_install_info>Please visit Services - SquidGuard Proxy Filter - Target Categories and set up at least one category there before enabling SquidGuard. See https://forum.pfsense.org/index.php?topic=94312.0 for details.</after_install_info>
 	</package>