diff --git a/nmap-os-db b/nmap-os-db
index ee53684da..3ada2b72e 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -4861,7 +4861,7 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUD=G)
 IE(DFI=S%T=3B-45%TG=40%CD=S)
 
 # Darwin Kernel Version 14.1.0 root:xnu-2782.10.72~2/REALESE_X86_64 x86_64
-Fingerprint Apple Mac OS X 10.10.2 (Darwin 14.1.0)
+Fingerprint Apple Mac OS X 10.10.2 (Yosemite) (Darwin 14.1.0)
 Class Apple | Mac OS X | 10.10.X | general purpose
 CPE cpe:/o:apple:mac_os_x:10.10.2 auto
 SEQ(SP=100-10A%GCD=1-6%ISR=105-10F%TI=RD%CI=RD%II=RI%TS=A)
@@ -35158,8 +35158,8 @@ IE(DFI=N%T=3A-44%TG=40%CD=S)
 Fingerprint IBM i5/OS V5R4 - V6R1
 Class IBM | i5/OS | V5 | general purpose
 CPE cpe:/o:ibm:i5os:v5 auto
-Class IBM | i5/OS | V6 | general purpose
-CPE cpe:/o:ibm:i5os:v6 auto
+Class IBM | i | 6.X | general purpose
+CPE cpe:/o:ibm:i:6.1
 SEQ(SP=9B-B3%GCD=1-6%ISR=A2-B8%TI=I%II=I%SS=S%TS=A|B)
 OPS(O1=M5ACNW0NNT11%O2=M578NW0NNT11%O3=M280NW0NNT11%O4=M5ACNW0NNT11%O5=M218NW0NNT11%O6=M109NNT11)
 WIN(W1=2000|FA00%W2=2000|FA00%W3=2000|FA00%W4=2000|FA00%W5=2000|FA00%W6=2000|FA00)
@@ -35193,9 +35193,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # IBM i5/OS V6, IBM iSeries
-Fingerprint IBM i5/OS V6
-Class IBM | i5/OS | V6 | general purpose
-CPE cpe:/o:ibm:i5os:v6 auto
+Fingerprint IBM i 6
+Class IBM | i | 6.X | general purpose
+CPE cpe:/o:ibm:i:6 auto
 SEQ(SP=A5-AF%GCD=1-6%ISR=AD-B9%TI=I%CI=I|RD%II=I%SS=S%TS=A)
 OPS(O1=M578NW4NNT11%O2=M578NW4NNT11%O3=M280NW4NNT11%O4=M578NW4NNT11%O5=M218NW4NNT11%O6=M109NNT11)
 WIN(W1=9C40%W2=9C40%W3=9C40%W4=9C40%W5=9C40%W6=FFFF)
@@ -35211,9 +35211,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # IBM i5/OS V6R1
-Fingerprint IBM i5/OS V6R1
-Class IBM | i5/OS | V6 | general purpose
-CPE cpe:/o:ibm:i5os:v6 auto
+Fingerprint IBM i 6.1
+Class IBM | i | 6.X | general purpose
+CPE cpe:/o:ibm:i:6.1 auto
 SEQ(SP=AA-B8%GCD=1-6%ISR=AD-B7%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5ACNW0NNT11%O2=M578NW0NNT11%O3=M280NW0NNT11%O4=M5ACNW0NNT11%O5=M218NW0NNT11%O6=M109NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=8000)
@@ -35230,9 +35230,9 @@ IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # IBM 8203-E4A Power6 server running i5/OS V6R1.
 # IBM Power Systems server running i5/OS V6R1.
-Fingerprint IBM i5/OS V6R1
-Class IBM | i5/OS | V6 | general purpose
-CPE cpe:/o:ibm:i5os:v6 auto
+Fingerprint IBM i 6.1
+Class IBM | i | 6.X | general purpose
+CPE cpe:/o:ibm:i:6.1 auto
 SEQ(SP=A4-B4%GCD=1-8%ISR=AE-BA%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M59CNW5NNT11%O2=M578NW5NNT11%O3=M280NW5NNT11%O4=M59CNW5NNT11%O5=M218NW5NNT11%O6=M109NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=FFFF)
@@ -35248,9 +35248,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # IBM Power Systems server running i5/OS V6R1.
-Fingerprint IBM i5/OS V6R1
-Class IBM | i5/OS | V6 | general purpose
-CPE cpe:/o:ibm:i5os:v6 auto
+Fingerprint IBM i 6.1
+Class IBM | i | 6.X | general purpose
+CPE cpe:/o:ibm:i:6.1 auto
 SEQ(SP=AB-B5%GCD=1-6%ISR=AD-B7%TI=I%II=I%SS=S%TS=A)
 OPS(O1=M5ACNW0NNT11%O2=M578NW0NNT11%O3=M280NW0NNT11%O4=M5ACNW0NNT11%O5=M218NW0NNT11%O6=M109NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)
@@ -35266,9 +35266,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # IBM i5/OS V7R1M0
-Fingerprint IBM i5/OS V7R1
-Class IBM | i5/OS | V7 | general purpose
-CPE cpe:/o:ibm:i5os:v7 auto
+Fingerprint IBM i 7.1
+Class IBM | i | 7.X | general purpose
+CPE cpe:/o:ibm:i:7.1 auto
 SEQ(CI=I%II=I)
 OPS(O1=M5B4NW1NNT11%O2=M578NW1NNT11%O3=M280NW1NNT11%O4=M5B4NW1NNT11%O5=M218NW1NNT11%O6=M109NNT11)
 WIN(W1=8000%W2=8000%W3=8000%W4=8000%W5=8000%W6=FFFF)
@@ -35284,9 +35284,9 @@ U1(DF=N%T=3B-45%TG=40%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=3B-45%TG=40%CD=S)
 
 # IBM Power8 server running i5/OS Version 7R2
-Fingerprint IBM i5/OS V7R2
-Class IBM | i5/OS | V7 | general purpose
-CPE cpe:/o:ibm:i5os:v7 auto
+Fingerprint IBM i 7.2
+Class IBM | i | 7.X | general purpose
+CPE cpe:/o:ibm:i:7.2 auto
 SEQ(SP=8B-AD%GCD=1-6|10|20|30|40|50%ISR=A4-B8%TI=I%CI=I%II=I%SS=S%TS=A)
 OPS(O1=M5B4NW0NNT11%O2=M578NW0NNT11%O3=M280NW0NNT11%O4=M5B4NW0NNT11%O5=M218NW0NNT11%O6=M109NNT11)
 WIN(W1=2000%W2=2000%W3=2000%W4=2000%W5=2000%W6=2000)