diff --git a/CHANGELOG b/CHANGELOG
index 942e59324..b7149705e 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -38,7 +38,7 @@ o Reworded an error message after a woman reported that it was "highly
   above should have no place in software."  The message was: "TCP/IP
   fingerprinting (for OS scan) requires root privileges. Sorry,
   dude.".  I checked svn blame to call out the insensitive,
-  chauvinistic jerk who wrote that message, but it was me :).
+  chauvinistic jerk who wrote that error message, but it was me :).
 
 o We received a bug report through Debian entitled "Nmap is a
   clairvoyant" because when you run it with -v on September 1 1970, it
diff --git a/nmap-os-db b/nmap-os-db
index 4884f8ee0..4a02831ef 100644
--- a/nmap-os-db
+++ b/nmap-os-db
@@ -4103,23 +4103,6 @@ T7(R=Y%DF=N%T=20%TG=20%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=Y%T=20%TG=20%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=20%TG=20%TOSI=Z%CD=S%SI=S%DLI=S)
 
-# ReliantUNIX-N aka. SINIX-N running on RM400 machine (SVR4 derivative made by Fujitsu Siemens, running on MIPS R4000 hardware)
-Fingerprint Fujitsu Siemens ReliantUNIX-N (SINIX-N) on RM400
-Class Fujitsu Siemens | ReliantUNIX || general purpose
-SEQ(SP=91-9B%GCD=<7%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
-OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
-WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
-ECN(R=Y%DF=N%T=40%TG=40%W=7FFF%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=N%T=40%TG=40%W=7FFF%S=O%A=O%F=AS%O=M5B4NW0%RD=0%Q=)
-T4(R=Y%DF=N%T=40%TG=40%W=7FFF%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=FF%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUL=G%RUD=G)
-IE(DFI=S%T=FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
-
 # Fujitsu Siemens PRIMERGY Remote Manager; Chassis Type: RX100S4; Bios Version: 4.06 Rev. 1.00.2532; System Type: PRIMERGY RX100 S4;
 Fingerprint Fujitsu Siemens RX100 S4 Primergy remote manager
 Class Fujitsu Siemens | embedded || specialized
@@ -4137,6 +4120,23 @@ T7(R=Y%DF=N%T=FF%TG=FF%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(R=N)
 IE(DFI=N%T=FF%TG=FF%TOSI=Z%CD=Z%SI=S%DLI=S)
 
+# ReliantUNIX-N aka. SINIX-N running on RM400 machine (SVR4 derivative made by Fujitsu Siemens, running on MIPS R4000 hardware)
+Fingerprint Fujitsu Siemens ReliantUNIX-N (SINIX-N) on RM400
+Class Fujitsu Siemens | ReliantUNIX || general purpose
+SEQ(SP=91-9B%GCD=<7%ISR=99-A3%TI=I%II=I%SS=S%TS=U)
+OPS(O1=M5B4NW0%O2=M5B4NW0%O3=M5B4NW0%O4=M5B4NW0%O5=M5B4NW0%O6=M5B4)
+WIN(W1=7FFF%W2=7FFF%W3=7FFF%W4=7FFF%W5=7FFF%W6=7FFF)
+ECN(R=Y%DF=N%T=40%TG=40%W=7FFF%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=N%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=N%T=40%TG=40%W=7FFF%S=O%A=O%F=AS%O=M5B4NW0%RD=0%Q=)
+T4(R=Y%DF=N%T=40%TG=40%W=7FFF%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=FF%TG=FF%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=G%RUL=G%RUD=G)
+IE(DFI=S%T=FF%TG=FF%TOSI=Z%CD=S%SI=S%DLI=S)
+
 # GNU hurd 0.3 GNU-Mach 1.3.99/Hurd-0.3 i686-AT386 GNU
 Fingerprint GNU Hurd 0.3
 Class GNU | Hurd || general purpose
@@ -5844,6 +5844,22 @@ T7(R=Y%DF=Y%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=C0%IPL=164%UN=0%RIPL=G%RID=G%RIPCK=G%RUCK=G%RUL=G%RUD=G)
 IE(DFI=N%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
+Fingerprint Konica Minolta magicolor 2430 printer
+Class Konica Minolta | embedded || printer
+SEQ(SP=96-A0%GCD=<7%ISR=9A-A4%TI=I%II=I%SS=S%TS=1)
+OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
+WIN(W1=1%W2=1%W3=1%W4=1%W5=1%W6=1)
+ECN(R=Y%DF=Y%T=40%TG=40%W=1%O=M5B4NW0%CC=N%Q=)
+T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
+T2(R=N)
+T3(R=Y%DF=Y%T=40%TG=40%W=1%S=O%A=O%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
+T4(R=Y%DF=N%T=40%TG=40%W=1%S=A%A=Z%F=R%O=%RD=0%Q=)
+T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
+T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
+T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
+U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
+IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
+
 # KONICA MINOLTA magicolor 5430 DL
 Fingerprint Konica Minolta MagiColor 5430 DL printer
 Class Konica Minolta | embedded || printer
@@ -5861,22 +5877,6 @@ T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
 U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=1042%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
 IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
 
-Fingerprint Konica Minolta magicolor 2430 printer
-Class Konica Minolta | embedded || printer
-SEQ(SP=96-A0%GCD=<7%ISR=9A-A4%TI=I%II=I%SS=S%TS=1)
-OPS(O1=M5B4NW0NNT11%O2=M5B4NW0NNT11%O3=M5B4NW0NNT11%O4=M5B4NW0NNT11%O5=M5B4NW0NNT11%O6=M5B4NNT11)
-WIN(W1=1%W2=1%W3=1%W4=1%W5=1%W6=1)
-ECN(R=Y%DF=Y%T=40%TG=40%W=1%O=M5B4NW0%CC=N%Q=)
-T1(R=Y%DF=Y%T=40%TG=40%S=O%A=S+%F=AS%RD=0%Q=)
-T2(R=N)
-T3(R=Y%DF=Y%T=40%TG=40%W=1%S=O%A=O%F=AS%O=M5B4NW0NNT11%RD=0%Q=)
-T4(R=Y%DF=N%T=40%TG=40%W=1%S=A%A=Z%F=R%O=%RD=0%Q=)
-T5(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S+%F=AR%O=%RD=0%Q=)
-T6(R=Y%DF=N%T=40%TG=40%W=0%S=A%A=Z%F=R%O=%RD=0%Q=)
-T7(R=Y%DF=N%T=40%TG=40%W=0%S=Z%A=S%F=AR%O=%RD=0%Q=)
-U1(DF=N%T=40%TG=40%TOS=0%IPL=38%UN=0%RIPL=G%RID=G%RIPCK=Z%RUCK=0%RUL=G%RUD=G)
-IE(DFI=S%T=40%TG=40%TOSI=S%CD=S%SI=S%DLI=S)
-
 # Kyocera FS-3800 Network printer
 Fingerprint Kyocera FS-3800 network printer
 Class Kyocera | embedded || printer