diff --git a/CHANGELOG b/CHANGELOG
index be8541c47..0af43eab1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,5 +1,8 @@
 # Nmap Changelog ($Id$); -*-text-*-
 
+o Fixed some errors in nmap-os-db, probably caused by incorrect string
+  replacement during integration. This patch is from James Cook.
+
 o [Nsock, Ncat] Nsock has a new function, nsp_setbroadcast, that
   allows setting the SO_BROADCAST option on sockets. Ncat now sets
   this option unconditionally in connect mode to allow connections to
diff --git a/nmap-os-db b/nmap-os-db
index 3c5095f44..9a338f63e 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -23764,7 +23764,7 @@ Fingerprint Linux 2.6.18 - 2.6.31
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=B4-D2%GCD=1-6%ISR=C3-D5%TI=Z%CI=Z%II=I%TS=U)
 OPS(O1=M5B4NNSNW2|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW9%O2=M5B4NNSNW2|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW9%O3=M5B4NW2|M5B4NW4|M5B4NW5|M5B4NW6|M5B4NW7|M5B4NW9%O4=M5B4NNSNW2|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW9%O5=M5B4NNSNW2|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW9%O6=M5B4NNS)
-WIN(W1=16D0%W2=16D0%W5=16D0%W4=16D0%W5=16D0%W6=16D0)
+WIN(W1=16D0%W2=16D0%W3=16D0%W4=16D0%W5=16D0%W6=16D0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW2|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW9%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)
@@ -24005,7 +24005,7 @@ Fingerprint Linux 2.6.19 - 2.6.33
 Class Linux | Linux | 2.6.X | general purpose
 SEQ(SP=B4-D1%GCD=1-6%ISR=C3-D7%TI=Z%CI=Z%II=I%TS=7)
 OPS(O1=M5B4ST11NW2|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8%O2=M5B4ST11NW2|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8%O3=M5B4NNT11NW2|M5B4NNT11NW4|M5B4NNT11NW5|M5B4NNT11NW6|M5B4NNT11NW7|M5B4NNT11NW8%O4=M5B4ST11NW2|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8%O5=M5B4ST11NW2|M5B4ST11NW4|M5B4ST11NW5|M5B4ST11NW6|M5B4ST11NW7|M5B4ST11NW8%O6=M5B4ST11)
-WIN(W1=16A0%W2|W4=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
+WIN(W1=16A0%W2=16A0%W3=16A0%W4=16A0%W5=16A0%W6=16A0)
 ECN(R=Y%DF=Y%T=3B-45%TG=40%W=16D0%O=M5B4NNSNW2|M5B4NNSNW4|M5B4NNSNW5|M5B4NNSNW6|M5B4NNSNW7|M5B4NNSNW8%CC=Y%Q=)
 T1(R=Y%DF=Y%T=3B-45%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
 T2(R=N)