diff --git a/gas/ChangeLog b/gas/ChangeLog
index 232cdc4b519..07303234881 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -9,7 +9,7 @@ Tue Feb 24 11:01:25 1998  Doug Evans  <devans@canuck.cygnus.com>
 	(UNIQUE_LABEL_PREFIX): New macro.
 	(unique_label): Use it.
 	(assemble_gif): Emit start label before mach label.
-	(s_endgif): Update.
+	(s_endgif): Update.  NLOOP is in quadwords for IMAGE mode now.
 
 Mon Feb 23 15:55:12 1998  Doug Evans  <devans@canuck.cygnus.com>
 
diff --git a/gas/config/tc-dvp.c b/gas/config/tc-dvp.c
index fa5dacc3554..c3804c6fe15 100644
--- a/gas/config/tc-dvp.c
+++ b/gas/config/tc-dvp.c
@@ -2108,10 +2108,10 @@ s_endgif (ignore)
 
   /* The -16 is because the `gif_data_name' label is emitted at the start
      of the gif tag.  */
-  if (gif_insn_type == GIF_PACKED)
-    count = eval_expr (0, 0, "(. - %s - 16) >> 4", gif_data_name);
-  else
+  if (gif_insn_type == GIF_REGLIST)
     count = eval_expr (0, 0, "(. - %s - 16) >> 3", gif_data_name);
+  else
+    count = eval_expr (0, 0, "(. - %s - 16) >> 4", gif_data_name);
 
   if (count < 0
       || fixup_count != 0)