diff --git a/common/drive_minrmt.c b/common/drive_minrmt.c
index 5f5f96c..8c57699 100644
--- a/common/drive_minrmt.c
+++ b/common/drive_minrmt.c
@@ -1969,7 +1969,7 @@
 do_get_align_cnt( drive_t * drivep )
 {
 	char *next_alignment_point;
-	__psint_t next_alignment_off;
+	intptr_t next_alignment_off;
 	drive_context_t *contextp;
 
 	contextp = ( drive_context_t * )drivep->d_contextp;
@@ -1990,7 +1990,7 @@
 	 * the following algorithm works because all buffers are page-aligned
 	 * and a multiple of PGSZ.
 	 */
-	next_alignment_off = ( __psint_t )contextp->dc_nextp;
+	next_alignment_off = ( intptr_t )contextp->dc_nextp;
 	next_alignment_off +=  PGMASK;
 	next_alignment_off &= ~PGMASK;
 	next_alignment_point = ( char * )next_alignment_off;
diff --git a/common/drive_scsitape.c b/common/drive_scsitape.c
index 71b809f..0abb5d0 100644
--- a/common/drive_scsitape.c
+++ b/common/drive_scsitape.c
@@ -2119,7 +2119,7 @@
 do_get_align_cnt( drive_t * drivep )
 {
 	char *next_alignment_point;
-	__psint_t next_alignment_off;
+	intptr_t next_alignment_off;
 	drive_context_t *contextp;
 
 	contextp = ( drive_context_t * )drivep->d_contextp;
@@ -2140,7 +2140,7 @@
 	 * the following algorithm works because all buffers are page-aligned
 	 * and a multiple of PGSZ.
 	 */
-	next_alignment_off = ( __psint_t )contextp->dc_nextp;
+	next_alignment_off = ( intptr_t )contextp->dc_nextp;
 	next_alignment_off +=  PGMASK;
 	next_alignment_off &= ~PGMASK;
 	next_alignment_point = ( char * )next_alignment_off;
diff --git a/common/drive_simple.c b/common/drive_simple.c
index 401cd7f..2b0447d 100644
--- a/common/drive_simple.c
+++ b/common/drive_simple.c
@@ -1296,7 +1296,7 @@
 do_get_align_cnt( drive_t *drivep )
 {
 	drive_context_t *contextp = ( drive_context_t * )drivep->d_contextp;
-	__psint_t next_alignment_off;
+	intptr_t next_alignment_off;
 	char *next_alignment_point;
 
 	mlog( MLOG_NITTY | MLOG_DRIVE,
@@ -1313,7 +1313,7 @@
 	 * the following algorithm works because dc_buf is page-aligned and
 	 * a multiple of PGSZ.
 	 */
-	next_alignment_off = ( __psint_t )contextp->dc_nextp;
+	next_alignment_off = ( intptr_t )contextp->dc_nextp;
 	next_alignment_off +=  PGMASK;
 	next_alignment_off &= ~PGMASK;
 	next_alignment_point = ( char * )next_alignment_off;
diff --git a/common/util.h b/common/util.h
index 86ea8d2..8ac1831 100644
--- a/common/util.h
+++ b/common/util.h
@@ -163,8 +163,8 @@
  * Align pointer up to alignment
  */
 #define	ALIGN_PTR(p,a)	\
-	(((__psint_t)(p) & ((a)-1)) ? \
-		((void *)(((__psint_t)(p) + ((a)-1)) & ~((a)-1))) : \
+	(((intptr_t)(p) & ((a)-1)) ? \
+		((void *)(((intptr_t)(p) + ((a)-1)) & ~((a)-1))) : \
 		((void *)(p)))
 
 #endif /* UTIL_H */
diff --git a/debian/changelog b/debian/changelog
index 5451166..308ffe3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xfsdump (3.1.5) unstable; urgency=low
+
+  * New upstream release (closes: #799201)
+
+ -- Nathan Scott <nathans@debian.org> Fri, 25 Sep 2015 08:42:23 +1000
+
 xfsdump (3.1.4) unstable; urgency=low
 
   * New upstream release (closes: #747079)