diff --git a/libgloss/ChangeLog b/libgloss/ChangeLog
index 8cbffb260..1ccc41255 100644
--- a/libgloss/ChangeLog
+++ b/libgloss/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19  Eric Christopher  <echristo@redhat.com>
+
+	* mips/regs.S: Sign extend constants for mips64 and unify
+        address handling.
+
 2005-04-12  Shaun Jackman  <sjackman@gmail.com>
 
 	* libgloss/arm/Makefile.in (RDPMON_BSP): librdpmon.a was empty due 
diff --git a/libgloss/mips/regs.S b/libgloss/mips/regs.S
index 17cc15a75..bdf933f13 100644
--- a/libgloss/mips/regs.S
+++ b/libgloss/mips/regs.S
@@ -53,15 +53,16 @@
 #define fp1	$f1
 
 /* Useful memory constants: */
-#define K0BASE		0x80000000
 #ifndef __mips64
+#define K0BASE          0x80000000
 #define K1BASE		0xA0000000
 #define K0BASE_ADDR	((char *)K0BASE)
 #define K1BASE_ADDR	((char *)K1BASE)
 #else
-#define K1BASE		0xFFFFFFFFA0000000LL
+#define K0BASE          0xFFFFFFFF80000000
+#define K1BASE		0xFFFFFFFFA0000000
 #define K0BASE_ADDR	((char *)0xFFFFFFFF80000000LL)
-#define K1BASE_ADDR	((char *)K1BASE)
+#define K1BASE_ADDR	((char *)0xFFFFFFFFA0000000LL)
 #endif
 
 #define PHYS_TO_K1(a)   ((unsigned)(a) | K1BASE)