diff --git a/nmap-os-db b/nmap-os-db
index 2d246e5f3..1216df75b 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -35042,6 +35042,79 @@ T7(R=Y%DF=N%T=FA-104%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=FA-104%TG=FF%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUD=G)
 IE(DFI=N%T=FA-104%TG=FF%CD=S)
 
+# IBM i5/OS V6, IBM iSeries
+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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=9C40%O=M578NW4%CC=N)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S%F=AR%RD=0)
+T3(R=N)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A|O%A=Z%F=R%RD=0)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S+%F=AR%RD=0)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A|O%A=Z%F=R%RD=0)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S+%F=AR%RD=0)
+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 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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M5ACNW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+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 8203-E4A Power6 server running i5/OS V6R1.
+# IBM Power Systems server running i5/OS V6R1.
+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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M59CNW5%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+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 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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5ACNW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=N)
+T4(R=N)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=N)
+T7(R=N)
+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)
+
 # O/S name for this server is "i" and this system is running v7. They dropped the "5" from "i5/OS" when they came out with v7.1
 Fingerprint IBM i 7.1
 Class IBM | i | 7.X | general purpose
@@ -35060,6 +35133,42 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 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 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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M5B4NW1%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+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 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)
+ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+T3(R=N)
+T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+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)
+
 # OS/400 V5R2
 Fingerprint IBM i5/OS V5R2
 Class IBM | i5/OS | V5 | general purpose
@@ -35192,115 +35301,6 @@ T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 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 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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=9C40%O=M578NW4%CC=N)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0)
-T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S%F=AR%RD=0)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A|O%A=Z%F=R%RD=0)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S+%F=AR%RD=0)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A|O%A=Z%F=R%RD=0)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=O|S+%F=AR%RD=0)
-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 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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M5ACNW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-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 8203-E4A Power6 server running i5/OS V6R1.
-# IBM Power Systems server running i5/OS V6R1.
-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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M59CNW5%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-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 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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5ACNW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=N)
-T4(R=N)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=N)
-T7(R=N)
-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 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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=8000%O=M5B4NW1%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-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 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)
-ECN(R=Y%DF=Y%T=3B-45%TG=40%W=2000%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-T3(R=N)
-T4(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=3B-45%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=3B-45%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-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)
-
 # OS/2 Warp 3.0
 Fingerprint IBM OS/2 Warp 3.0
 Class IBM | OS/2 | 3.X | general purpose