diff --git a/nmap-os-db b/nmap-os-db
index a041034d0..40849a5cf 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -51,6 +51,7 @@ IE(R=50%DFI=40%T=15%TG=15%CD=100)
 Fingerprint 2FXS K-3288W or PORTech MV-374 GSM-SIP VoIP gateway
 Class 2FXS | embedded || VoIP adapter
 Class PORTech | embedded || VoIP adapter
+CPE cpe:/h:portech:mv-374
 SEQ(SP=0-5%GCD=61A8|C350|124F8|186A0|1E848%ISR=8A-94%TI=I%II=RI%SS=O%TS=U)
 OPS(O1=M5B4|WANM5B4T10S%O2=M578|M578W0ST10L%O3=M280|T10NNW5NM280%O4=M5B4|ST10WAL%O5=M218|M218ST10WAL%O6=M109|M109ST10)
 WIN(W1=0|3180%W2=0|3180%W3=0|3180%W4=0|3180%W5=0|3180%W6=0|3180)
@@ -68,6 +69,7 @@ IE(DFI=S%T=FA-104%TG=FF%CD=S)
 # BT2700HGV DSL Router version 5.29.107.19
 Fingerprint 2Wire BT2700HGV ADSL modem
 Class 2Wire | embedded || broadband router
+CPE cpe:/h:2wire:bt2700hg-v
 SEQ(SP=6A-BE%GCD=1-6%ISR=96-A0%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -85,6 +87,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # BT2700HGV DSL Router version 5.29.107.19
 Fingerprint 2Wire BT2700HGV ADSL modem
 Class 2Wire | embedded || broadband router
+CPE cpe:/h:2wire:bt2700hg-v
 SEQ(SP=6A-BE%GCD=1-6%ISR=96-A0%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -102,6 +105,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # 2wire 1701HG Gateway 3.17.5
 Fingerprint 2Wire 1701HG wireless ADSL modem
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:1701hg
 SEQ(SP=7E-9A%GCD=1-6%ISR=9E-A8%TI=I%TS=A)
 OPS(O1=M5ACNNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -142,6 +146,7 @@ IE(R=N)
 # 2Wire 2701HG-B Gateway running version 5.29.47
 Fingerprint 2Wire 2700HG-B wireless ADSL modem
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:2700hg-b
 SEQ(SP=7C-AA%GCD=1-6%ISR=94-9E%TI=I%TS=A)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -159,6 +164,7 @@ IE(R=N)
 # 2wire 2701 HG router
 Fingerprint 2Wire 2701HG wireless ADSL modem
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:2701hg
 SEQ(SP=6D-C3%GCD=1-6%ISR=96-A0%TI=I%CI=I%TS=E)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -176,6 +182,7 @@ IE(R=N)
 # 2wire router/WAP/DSL-modem is model# 2701HG-B
 Fingerprint 2Wire 2701HG-B wireless ADSL modem
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:2701hg-b
 SEQ(SP=84-DA%GCD=1-6%ISR=95-CD%TI=I|RD%II=I%SS=S%TS=A)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -193,6 +200,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # 2Wire 2701HG-B Gateway AT&T DSL Wireless Access Point
 Fingerprint 2Wire 2701HG-B wireless ADSL modem
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:2701hg-b
 SEQ(SP=62-9E%GCD=1-6%ISR=99-A3%TI=I%CI=I%TS=A)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M5B4NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -210,6 +218,7 @@ IE(R=N)
 # 2-Wire 2701HG-G Gateway Software:  5.29.133.27
 Fingerprint 2Wire 2701HG-G wireless ADSL modem
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:2701hg-g
 SEQ(SP=7B-85%GCD=1-6%ISR=95-9F%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -228,6 +237,7 @@ IE(DFI=Y%T=FA-104%TG=FF%CD=S)
 # 2wire 1000SW Shasta 3.5.12
 Fingerprint 2Wire Shasta wireless broadband router
 Class 2Wire | embedded || WAP
+CPE cpe:/h:2wire:1000sw
 SEQ(SP=76-A2%GCD=1-6%ISR=A0-AD%TI=I%TS=7)
 OPS(O1=M5B4NNSW0NNNT11%O2=M578NNSW0NNNT11%O3=M280W0NNNT11%O4=M218NNSW0NNNT11%O5=M218NNSW0NNNT11%O6=M109NNSNNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)