--- build.xml
+++ build.xml
@@ -662,7 +662,6 @@
 			<zipfileset src="${extlibs.dir}/jnr-netdb-1.0.6-SNAPSHOT.jar"/>
 			<zipfileset src="${extlibs.dir}/jnr-posix-2.1-SNAPSHOT.jar"/>
             <zipfileset src="${extlibs.dir}/jnr-constants-0.8.3-SNAPSHOT.jar"/>
-            <!-- <rule pattern="com.kenai.constantine.**" result="org.python.constantine.@1"/> -->
             <zipfileset src="extlibs/xercesImpl-2.9.1.jar" excludes="META-INF/services/*"/>
             <rule pattern="org.apache.xml.**" result="org.python.apache.xml.@1"/>
             <rule pattern="org.apache.xerces.**" result="org.python.apache.xerces.@1"/>
--- src/org/python/core/Py.java
+++ src/org/python/core/Py.java
@@ -21,8 +21,8 @@
 import java.util.Set;
 
 import org.python.antlr.base.mod;
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.Constant;
+import jnr.constants.platform.Errno;
 import java.util.ArrayList;
 import java.util.List;
 import org.python.core.adapter.ClassicPyObjectAdapter;
@@ -115,22 +115,14 @@
     }
 
     public static PyException OSError(Constant errno) {
-        int value = errno.value();
+        int value = errno.intValue();
         PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value));
         return new PyException(Py.OSError, args);
     }
     
     public static PyException OSError(Constant errno, PyObject filename) {
-        int value = errno.value();
-        // Pass to strerror because constantine currently lacks Errno descriptions on
-        // Windows, and strerror falls back to Linux's
-        PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value), filename);
-        return new PyException(Py.OSError, args);
-    }
-
-    public static PyException OSError(jnr.constants.Constant errno, PyObject filename) {
         int value = errno.intValue();
-        // Pass to strerror because constantine currently lacks Errno descriptions on
+        // Pass to strerror because jnr-constants currently lacks Errno descriptions on
         // Windows, and strerror falls back to Linux's
         PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value), filename);
         return new PyException(Py.OSError, args);
@@ -189,13 +181,13 @@
     }
 
     public static PyException IOError(Constant errno) {
-        int value = errno.value();
+        int value = errno.intValue();
         PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value));
         return new PyException(Py.IOError, args);
     }
 
     public static PyException IOError(Constant errno, PyObject filename) {
-        int value = errno.value();
+        int value = errno.intValue();
         PyObject args = new PyTuple(Py.newInteger(value), PosixModule.strerror(value), filename);
         return new PyException(Py.IOError, args);
     }
@@ -206,7 +198,7 @@
             message = ioe.getClass().getName();
         }
         if (ioe instanceof FileNotFoundException) {
-            PyTuple args = new PyTuple(Py.newInteger(Errno.ENOENT.value()),
+            PyTuple args = new PyTuple(Py.newInteger(Errno.ENOENT.intValue()),
                                        Py.newString("File not found - " + message));
             return new PyException(err, args);
         }
--- src/org/python/core/io/FileIO.java
+++ src/org/python/core/io/FileIO.java
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007 Jython Developers */
+/* Copyright (c) 2007-2012 Jython Developers */
 package org.python.core.io;
 
 import java.io.File;
@@ -12,7 +12,7 @@
 import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
 
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
 import jnr.posix.util.Platform;
 import org.python.core.Py;
 import org.python.core.PyString;
--- src/org/python/core/io/IOBase.java
+++ src/org/python/core/io/IOBase.java
@@ -1,7 +1,7 @@
-/* Copyright (c) 2007 Jython Developers */
+/* Copyright (c) 2007-2012 Jython Developers */
 package org.python.core.io;
 
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
 import java.io.InputStream;
 import java.io.OutputStream;
 
--- src/org/python/core/io/ServerSocketIO.java
+++ src/org/python/core/io/ServerSocketIO.java
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007 Jython Developers */
+/* Copyright (c) 2007-2012 Jython Developers */
 package org.python.core.io;
 
 import java.nio.ByteBuffer;
 import java.nio.channels.ServerSocketChannel;
 
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
 import org.python.core.Py;
 
 /**
--- src/org/python/modules/_py_compile.java
+++ src/org/python/modules/_py_compile.java
@@ -3,7 +3,7 @@
 
 import java.io.File;
 
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
 import org.python.core.Py;
 import org.python.core.PyList;
 import org.python.core.PyString;
--- src/org/python/modules/cStringIO.java
+++ src/org/python/modules/cStringIO.java
@@ -11,7 +11,6 @@
 
 package org.python.modules;
 
-import com.kenai.constantine.platform.Errno;
 import org.python.core.Py;
 import org.python.core.PyIterator;
 import org.python.core.PyList;
--- src/org/python/modules/errno.java
+++ src/org/python/modules/errno.java
@@ -1,9 +1,9 @@
 /* Copyright (c) Jython Developers */
 package org.python.modules;
 
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.ConstantSet;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.Constant;
+import jnr.constants.ConstantSet;
+import jnr.constants.platform.Errno;
 import jnr.posix.util.Platform;
 import org.python.core.ClassDictInit;
 import org.python.core.Py;
@@ -16,7 +16,7 @@
  * The Python errno module.
  *
  * Errno constants can be accessed from Java code via
- * {@link com.kenai.constantine.platform.Errno}, e.g. Errno.ENOENT.
+ * {@link jnr.constants.platform.Errno}, e.g. Errno.ENOENT.
  */
 public class errno implements ClassDictInit {
 
@@ -61,7 +61,7 @@
         // WSA errnos (and other Windows LastErrors)
         ConstantSet lastErrors = ConstantSet.getConstantSet("LastError");
 
-        // Fill the gaps by searching through every possible constantine Errno first
+        // Fill the gaps by searching through every possible jnr-constants Errno first
         // checking if it's defined on Windows, then falling back to the WSA prefixed
         // version if it exists
         Constant constant;
@@ -69,20 +69,20 @@
             String errnoName = errno.name();
             if ((constant = winErrnos.getConstant(errnoName)) != null
                 || (constant = lastErrors.getConstant("WSA" + errnoName)) != null) {
-                addCode(dict, errnoName, constant.value(), constant.toString());
+                addCode(dict, errnoName, constant.intValue(), constant.toString());
             }
         }
         // Then provide the WSA names
         for (Constant lastError : lastErrors) {
             if (lastError.name().startsWith("WSA")) {
-                addCode(dict, lastError.name(), lastError.value(), lastError.toString());
+                addCode(dict, lastError.name(), lastError.intValue(), lastError.toString());
             }
         }
     }
 
     private static void initPosix(PyObject dict) {
         for (Constant constant : ConstantSet.getConstantSet("Errno")) {
-            addCode(dict, constant.name(), constant.value(), constant.toString());
+            addCode(dict, constant.name(), constant.intValue(), constant.toString());
         }
     }
 
@@ -94,7 +94,7 @@
     }
 
     /**
-     * @deprecated Use org.python.core.constantine.Errno.valueOf(code).toString() (or
+     * @deprecated Use jnr.constants.platform.Errno.valueOf(code).toString() (or
      *             os.strerror from Python) instead.
      */
     @Deprecated
--- src/org/python/modules/posix/PosixModule.java
+++ src/org/python/modules/posix/PosixModule.java
@@ -1,8 +1,8 @@
 /* Copyright (c) Jython Developers */
 package org.python.modules.posix;
 
-import com.kenai.constantine.Constant;
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.Constant;
+import jnr.constants.platform.Errno;
 
 import java.io.File;
 import java.io.FileDescriptor;
@@ -688,8 +688,8 @@
         }
         if (errno.name() == errno.toString()) {
             // Fake constant or just lacks a description, fallback to Linux's
-            // XXX: have constantine handle this fallback
-            errno = Enum.valueOf(com.kenai.constantine.platform.linux.Errno.class,
+            // XXX: have jnr-constants handle this fallback
+            errno = Enum.valueOf(jnr.constants.platform.linux.Errno.class,
                                  errno.name());
         }
         return new PyString(errno.toString());
--- src/org/python/util/JLineConsole.java
+++ src/org/python/util/JLineConsole.java
@@ -13,7 +13,7 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.kenai.constantine.platform.Errno;
+import jnr.constants.platform.Errno;
 
 import jline.ConsoleReader;
 import jline.Terminal;