diff --git a/NEWS b/NEWS
index 25a1e4a692..0993276508 100644
--- a/NEWS
+++ b/NEWS
@@ -9,20 +9,20 @@ Version 2.17
 
 * The following bugs are resolved with this release:
 
-  1349, 3439, 3479, 3665, 5044, 5246, 5298, 5400, 6530, 6778, 6808, 9685,
-  9914, 10014, 10038, 10631, 10873, 11438, 11607, 11638, 11741, 12140,
-  13412, 13542, 13601, 13603, 13604, 13629, 13679, 13696, 13698, 13717,
-  13741, 13759, 13761, 13763, 13881, 13939, 13950, 13952, 13966, 14042,
-  14047, 14090, 14150, 14151, 14152, 14154, 14157, 14166, 14173, 14195,
-  14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328, 14331, 14336,
-  14337, 14347, 14349, 14368, 14376, 14417, 14447, 14459, 14476, 14477,
-  14501, 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538, 14543,
-  14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587, 14595,
-  14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660, 14661, 14669,
-  14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783, 14784, 14785,
-  14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811, 14815, 14821,
-  14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863, 14865, 14866,
-  14868, 14869, 14871, 14879, 14889.
+  1349, 3439, 3479, 3665, 5044, 5246, 5298, 5400, 6530, 6677, 6778, 6808,
+  9685, 9914, 10014, 10038, 10631, 10873, 11438, 11607, 11638, 11741,
+  12140, 13412, 13542, 13601, 13603, 13604, 13629, 13679, 13696, 13698,
+  13717, 13741, 13759, 13761, 13763, 13881, 13939, 13950, 13952, 13966,
+  14042, 14047, 14090, 14150, 14151, 14152, 14154, 14157, 14166, 14173,
+  14195, 14237, 14251, 14252, 14283, 14298, 14303, 14307, 14328, 14331,
+  14336, 14337, 14347, 14349, 14368, 14376, 14417, 14447, 14459, 14476,
+  14477, 14501, 14505, 14510, 14516, 14518, 14519, 14530, 14532, 14538,
+  14543, 14544, 14545, 14557, 14562, 14568, 14576, 14579, 14583, 14587,
+  14595, 14602, 14610, 14621, 14638, 14645, 14648, 14652, 14660, 14661,
+  14669, 14672, 14683, 14694, 14716, 14719, 14743, 14767, 14783, 14784,
+  14785, 14793, 14796, 14797, 14801, 14803, 14805, 14807, 14811, 14815,
+  14821, 14822, 14824, 14828, 14831, 14835, 14838, 14856, 14863, 14865,
+  14866, 14868, 14869, 14871, 14879, 14889.
 
 * CVE-2011-4609 svc_run() produces high cpu usage when accept fails with
   EMFILE has been fixed (Bugzilla #14889).
diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
index 06332fe87f..034808d4a7 100644
--- a/ports/ChangeLog.hppa
+++ b/ports/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2012-11-29  Carlos O'Donell  <carlos@systemhalted.org>
+
+	* sysdeps/hppa/fpu/feholdexcpt.c: Cast return to unsigned long long *.
+	* sysdeps/unix/sysv/linux/hppa/mmap.c: Cast return to __ptr_t.
+
 2012-11-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_once.c: Replace _internal
diff --git a/ports/sysdeps/hppa/fpu/feholdexcpt.c b/ports/sysdeps/hppa/fpu/feholdexcpt.c
index 6e3cabd88a..ad2b0d0b48 100644
--- a/ports/sysdeps/hppa/fpu/feholdexcpt.c
+++ b/ports/sysdeps/hppa/fpu/feholdexcpt.c
@@ -1,5 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Huggins-Daines <dhd@debian.org>, 2000
 
@@ -42,7 +42,7 @@ feholdexcept (fenv_t *envp)
 
   /* Load the new environment. Note: fr0 must load last to enable T-bit 
      Thus we start bufptr at the end and work backwards */
-  bufptr = (unsigned int)(clear.buf) + sizeof(unsigned int)*4;
+  bufptr = (unsigned long long *)((unsigned int)(clear.buf) + sizeof(unsigned int)*4);
   __asm__ (
 	   "fldd,mb -8(%0),%%fr0\n"
 	   : : "r" (bufptr), "m" (clear) : "%r0");
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/mmap.c b/ports/sysdeps/unix/sysv/linux/hppa/mmap.c
index 420d6567a6..12e700dcbb 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/mmap.c
+++ b/ports/sysdeps/unix/sysv/linux/hppa/mmap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -36,7 +36,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 	
 	__ptr_t ret;
 
-	ret = INLINE_SYSCALL(mmap, 6, addr, len, prot, flags, fd, offset);
+	ret = (__ptr_t) INLINE_SYSCALL (mmap, 6, addr, len, prot, flags, fd, offset);
 
 	/* check if it's really a negative number */
 	if(((unsigned long)ret & 0xfffff000) == 0xfffff000)