diff --git a/include/opcode/ChangeLog b/include/opcode/ChangeLog
index a123b02ea1..272fb141b6 100644
--- a/include/opcode/ChangeLog
+++ b/include/opcode/ChangeLog
@@ -1,5 +1,7 @@
 Sun Sep 19 10:40:59 1999  Jeffrey A Law  (law@cygnus.com)
 
+	* hppa.h (pa_opcodes): Handle PA2.0 fcnv, fcmp and ftest insns.
+
 	* hppa.h (pa_opcodes): Finish support for PA2.0 "b" instructions.
 
 	* hppa.h (pa_opcodes): Handle PA2.0 "bve" instructions.
diff --git a/include/opcode/hppa.h b/include/opcode/hppa.h
index c3c0923d18..6113565235 100644
--- a/include/opcode/hppa.h
+++ b/include/opcode/hppa.h
@@ -72,7 +72,7 @@ struct pa_opcode
 
 	'  "#  &     -  /   34 6789:;< > @'
 	'  C      JK            XY [\]  '
-	'   de  h    m           y { } '
+	'   de                   y   } '
 
    Here are all the characters:
 
@@ -147,6 +147,10 @@ Also these:
    M    ,push completer for new syntax branch
    L    ,%r2 completer for new syntax branch
    B    ,pop completer for new syntax branch
+   {    Source format completer for fcnv
+   _    Destination format completer for fcnv
+   h    cbit for fcmp
+   =    gfx tests for ftest
 
 Completer operands all have 'c' as the prefix:
 
@@ -662,11 +666,17 @@ static const struct pa_opcode pa_opcodes[] =
 { "fneg",       0x3800c000, 0xfc1fe720, "IfA,fT", pa20, FLAG_STRICT},
 { "fnegabs",    0x3000e000, 0xfc1fe7e0, "Ffa,fT", pa20, FLAG_STRICT},
 { "fnegabs",    0x3800e000, 0xfc1fe720, "IfA,fT", pa20, FLAG_STRICT},
+{ "fcnv",       0x30000200, 0xfc1c0720, "{_fa,fT", pa20, FLAG_STRICT},
+{ "fcnv",       0x38000200, 0xfc1c0720, "FGfA,fT", pa20, FLAG_STRICT},
+{ "fcmp",       0x30000400, 0xfc0007e0, "F?ffa,fb,h", pa20, FLAG_STRICT},
+{ "fcmp",       0x38000400, 0xfc000720, "I?ffA,fB,h", pa20, FLAG_STRICT},
 { "fcmp",       0x30000400, 0xfc00e7e0, "F?ffa,fb", pa10},
 { "fcmp",       0x38000400, 0xfc00e720, "I?ffA,fB", pa10},
 { "xmpyu",	0x38004700, 0xfc00e720, "fX,fB,fT", pa11},
 { "fmpyadd",	0x18000000, 0xfc000000, "Hfi,fj,fk,fl,fm", pa11},
 { "fmpysub",	0x98000000, 0xfc000000, "Hfi,fj,fk,fl,fm", pa11},
+{ "ftest",      0x30002420, 0xffffffe0, ",=", pa20, FLAG_STRICT},
+{ "ftest",      0x30000420, 0xffff1fff, "m", pa20, FLAG_STRICT},
 { "ftest",      0x30002420, 0xffffffff, "", pa10},
 { "fid",        0x30000000, 0xffffffff, "", pa11},