diff --git a/contrib/less/less.h b/contrib/less/less.h
index 021b2df5e0e7..1b446b533445 100644
--- a/contrib/less/less.h
+++ b/contrib/less/less.h
@@ -1,3 +1,4 @@
+/* $FreeBSD$ */
 /*
  * Copyright (C) 1984-2000  Mark Nudelman
  *
@@ -139,8 +140,8 @@ void free();
 /*
  * Special types and constants.
  */
-typedef long		POSITION;
-#define PR_POSITION	"%ld"
+typedef off_t		POSITION;
+#define PR_POSITION	"%lld"
 #define MAX_PRINT_POSITION 20
 #define MAX_PRINT_INT      10
 
diff --git a/contrib/less/prompt.c b/contrib/less/prompt.c
index 14480213dff4..14f8ac4253d1 100644
--- a/contrib/less/prompt.c
+++ b/contrib/less/prompt.c
@@ -1,3 +1,4 @@
+/* $FreeBSD$ */
 /*
  * Copyright (C) 1984-2000  Mark Nudelman
  *
@@ -111,7 +112,7 @@ ap_pos(pos)
 {
 	char buf[MAX_PRINT_POSITION];
 
-	sprintf(buf, PR_POSITION, pos);
+	sprintf(buf, PR_POSITION, (long long)pos);
 	ap_str(buf);
 }