diff --git a/libtransmission/bencode.c b/libtransmission/bencode.c
index a57ebe14c..1a22f3869 100644
--- a/libtransmission/bencode.c
+++ b/libtransmission/bencode.c
@@ -187,7 +187,7 @@ static void __bencPrint( benc_val_t * val, int space )
     switch( val->type )
     {
         case TYPE_INT:
-            fprintf( stderr, "int:  %"PRIu64"\n", val->val.i );
+            fprintf( stderr, "int:  %"PRId64"\n", val->val.i );
             break;
 
         case TYPE_STR:
@@ -431,7 +431,7 @@ int tr_bencSave( benc_val_t * val, char ** buf, int * used, int * max )
     switch( val->type )
     {
         case TYPE_INT:
-            if( tr_sprintf( buf, used, max, "i%"PRIu64"e", val->val.i ) )
+            if( tr_sprintf( buf, used, max, "i%"PRId64"e", val->val.i ) )
             {
                 return 1;
             }
diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
index 94147fee9..f0f2abbf1 100644
--- a/libtransmission/transmission.h
+++ b/libtransmission/transmission.h
@@ -32,8 +32,11 @@ extern "C" {
 #include "version.h"
 
 #include <inttypes.h>
+#ifndef PRId64
+# define PRId64 "lld"
+#endif
 #ifndef PRIu64
-# define PRIu64 "lld"
+# define PRIu64 "llu"
 #endif
 #include <time.h>