diff --git a/TPG300/iocBoot/iocTPG300-IOC-01/config.xml b/TPG300/iocBoot/iocTPG300-IOC-01/config.xml
index 337f389e2..bd83cf493 100644
--- a/TPG300/iocBoot/iocTPG300-IOC-01/config.xml
+++ b/TPG300/iocBoot/iocTPG300-IOC-01/config.xml
@@ -1,13 +1,15 @@
 <?xml version="1.0" ?>
 <ioc_config xmlns:xi="http://www.w3.org/2001/XInclude">
     <config_part>
-        <ioc_desc>Pfeiffer TPG 300 pressure sensor</ioc_desc>
+        <ioc_desc>Pfeiffer TPG x00 pressure sensor (300/500)</ioc_desc>
         <macros>
             <macro name="PORT" pattern="^COM[0-9]+$" description="Serial COM Port" hasDefault="NO" />
+            <macro name="IPADDR" pattern="^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$" description="IP Address - for use ONLY on 500 models" hasDefault="NO" />
             <macro name="PRESA1ON" pattern="^Y|N$" description="Set to Y if measurement circuit A1 is connected (default:Y)" defaultValue="Y" hasDefault="YES" />
             <macro name="PRESA2ON" pattern="^Y|N$" description="Set to Y if measurement circuit A2 is connected (default:Y)" defaultValue="Y" hasDefault="YES" />
             <macro name="PRESB1ON" pattern="^Y|N$" description="Set to Y if measurement circuit B1 is connected (default:Y)" defaultValue="Y" hasDefault="YES" />
             <macro name="PRESB2ON" pattern="^Y|N$" description="Set to Y if measurement circuit B2 is connected (default:Y)" defaultValue="Y" hasDefault="YES" />
+            <macro name="MODEL" pattern="^(300|500)$" description="Pfeiffer TPGx00 model number (default:300)" defaultValue="300" hasDefault="YES" />
 </macros>
 </config_part>
 </ioc_config>
diff --git a/TPG300/iocBoot/iocTPG300-IOC-01/st-common.cmd b/TPG300/iocBoot/iocTPG300-IOC-01/st-common.cmd
index 96e3f6d69..47a733575 100644
--- a/TPG300/iocBoot/iocTPG300-IOC-01/st-common.cmd
+++ b/TPG300/iocBoot/iocTPG300-IOC-01/st-common.cmd
@@ -3,6 +3,8 @@
 
 epicsEnvSet "STREAM_PROTOCOL_PATH" "$(TPG)/data"
 
+stringiftest("USEIP", "$(IPADDR=)", 3)
+
 ## For recsim:
 $(IFRECSIM) drvAsynSerialPortConfigure("L0", "$(PORT=NUL)", 0, 1, 0, 0)
 
@@ -10,19 +12,21 @@ $(IFRECSIM) drvAsynSerialPortConfigure("L0", "$(PORT=NUL)", 0, 1, 0, 0)
 $(IFDEVSIM) drvAsynIPPortConfigure("L0", "localhost:$(EMULATOR_PORT=57677)")
 
 ## For real device use:
-$(IFNOTDEVSIM) $(IFNOTRECSIM) drvAsynSerialPortConfigure("L0", "$(PORT)", 0, 0, 0, 0)
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "baud", "9600")
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "bits", "8")
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "parity", "none")
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "stop", "1")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) drvAsynSerialPortConfigure("L0", "$(PORT=NOTSPECIFIED)", 0, 0, 0, 0)
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "baud", "9600")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "bits", "8")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "parity", "none")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", -1, "stop", "1")
 
 # Hardware flow control off
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", 0, "clocal", "Y")
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"crtscts","N")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0", 0, "clocal", "Y")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"crtscts","N")
 
 # Software flow control off
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixon","N") 
-$(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixoff","N")
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixon","N") 
+$(IFNOTUSEIP) $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixoff","N")
+
+$(IFUSEIP) drvAsynIPPortConfigure("L0", "$(IPADDR=NOTSPECIFIED):8000")
 
 ## Load record instances
 
@@ -31,18 +35,22 @@ $(IFNOTDEVSIM) $(IFNOTRECSIM) asynSetOption("L0",0,"ixoff","N")
 
 #####################
 ## Load record instances
+stringiftest("300", $(MODEL="300"), 5, "300")
 
 stringiftest("PRESSURA1", $(PRESA1ON="Y"), 5, "Y")
 stringiftest("PRESSURA2", $(PRESA2ON="Y"), 5, "Y")
 stringiftest("PRESSURB1", $(PRESB1ON="Y"), 5, "Y")
 stringiftest("PRESSURB2", $(PRESB2ON="Y"), 5, "Y")
 
-dbLoadRecords("$(TPG)/db/devTPG300.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
-dbLoadRecords("$(TPG)/db/TPG300_channels.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0), IFPRESSURA1=$(IFPRESSURA1),IFPRESSURA2=$(IFPRESSURA2),IFPRESSURB1=$(IFPRESSURB1),IFPRESSURB2=$(IFPRESSURB2)")
+dbLoadRecords("$(TPG)/db/devTPGx00.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),IF300=$(IF300),IFNOT300=$(IFNOT300)")
+$(IF300) dbLoadRecords("$(TPG)/db/devTPG300.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
+$(IFNOT300) dbLoadRecords("$(TPG)/db/devTPG500.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
+dbLoadRecords("$(TPG)/db/TPG300_channels.db","P=$(MYPVPREFIX)$(IOCNAME):, PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0), IFPRESSURA1=$(IFPRESSURA1),IFPRESSURA2=$(IFPRESSURA2),IFPRESSURB1=$(IFPRESSURB1),IFPRESSURB2=$(IFPRESSURB2),IF300=$(IF300),IFNOT300=$(IFNOT300)")
 dbLoadRecords("$(TPG)/db/unit_setter.db","P=$(MYPVPREFIX)$(IOCNAME):")
-dbLoadRecords("$(TPG)/db/TPG300_switching_functions_rb.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
-dbLoadRecords("$(TPG)/db/TPG300_switching_functions.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
-dbLoadRecords("$(TPG)/db/TPG300_function_statuses.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
+dbLoadRecords("$(TPG)/db/TPG300_switching_functions_rb.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),IF300=$(IF300),IFNOT300=$(IFNOT300)")
+$(IF300) dbLoadRecords("$(TPG)/db/TPG300_switching_functions_rb_AB.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),IF300=$(IF300),IFNOT300=$(IFNOT300)")
+dbLoadRecords("$(TPG)/db/TPG300_switching_functions.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),IF300=$(IF300),IFNOT300=$(IFNOT300)")
+dbLoadRecords("$(TPG)/db/TPG300_function_statuses.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),IF300=$(IF300),IFNOT300=$(IFNOT300)")
 dbLoadRecords("$(TPG)/db/TPG300_switching_functions_rb_error_setter.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")
 dbLoadRecords("$(TPG)/db/TPG300_function_statuses_error_setter.db","P=$(MYPVPREFIX)$(IOCNAME):,PORT=L0,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0)")