diff --git a/classpath/java/lang/Long.java b/classpath/java/lang/Long.java
index 913267d7bf..06c1d7506e 100644
--- a/classpath/java/lang/Long.java
+++ b/classpath/java/lang/Long.java
@@ -2,6 +2,7 @@ package java.lang;
 
 public final class Long extends Number {
   public static final Class TYPE = Class.forCanonicalName("J");
+  public static final Long MAX_VALUE = 9223372036854775807l;
 
   private final long value;
 
diff --git a/classpath/java/lang/Short.java b/classpath/java/lang/Short.java
index 4b014cc207..8c3834eff6 100644
--- a/classpath/java/lang/Short.java
+++ b/classpath/java/lang/Short.java
@@ -2,6 +2,7 @@ package java.lang;
 
 public final class Short extends Number {
   public static final Class TYPE = Class.forCanonicalName("S");
+  public static final short MAX_VALUE = 32767;
 
   private final short value;