diff --git a/src/H5.c b/src/H5.c
index 2c40405c55..ea2793a6bb 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -752,7 +752,7 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 	    fmt += 2;
 	    nout++;
 	} else if ('%'==fmt[0]) {
-	    s = fmt+1;
+	    s = fmt + 1;
 
 	    /* Flags */
 	    while (HDstrchr ("-+ #", *s)) {
@@ -821,7 +821,14 @@ HDfprintf (FILE *stream, const char *fmt, ...)
 			HDstrcpy (modifier, PRINTF_LL_WIDTH);
 		    }
 		    break;
-		    
+                case 'l':
+                    /* takes care of "long long (ll)" modifiers */
+                    if (*(s + 1) == 'l') {
+                        HDstrcpy(modifier, "ll");
+                        s++;
+                        break;
+                    }
+                    /* FALL THROUGH */
 		default:
                     /* Handle 'll' for long long types */
                     if(*s=='l' && *(s+1)=='l') {