diff --git a/src/main/java/com/ibm/as400/access/AS400JDBCConnection.java b/src/main/java/com/ibm/as400/access/AS400JDBCConnection.java
index 8aa14011..cc7f890b 100644
--- a/src/main/java/com/ibm/as400/access/AS400JDBCConnection.java
+++ b/src/main/java/com/ibm/as400/access/AS400JDBCConnection.java
@@ -57,7 +57,7 @@ abstract class  AS400JDBCConnection
 extends ToolboxWrapper
 /* endif */ 
 
-implements Connection
+implements Connection, AutoCloseable
 {
 
   static final int            DATA_COMPRESSION_NONE_  = 0;            // @ECA
diff --git a/src/main/java/com/ibm/as400/access/AS400JDBCConnectionHandle.java b/src/main/java/com/ibm/as400/access/AS400JDBCConnectionHandle.java
index a3c253ab..ba76ed12 100644
--- a/src/main/java/com/ibm/as400/access/AS400JDBCConnectionHandle.java
+++ b/src/main/java/com/ibm/as400/access/AS400JDBCConnectionHandle.java
@@ -73,7 +73,7 @@ public class AS400JDBCConnectionHandle
 /* ifdef JDBC40 */
 extends ToolboxWrapper
 /* endif */ 
-implements Connection //@A5A
+implements Connection, AutoCloseable //@A5A
 //@A5D extends AS400JDBCConnection
 {
   
diff --git a/src/main/java/com/ibm/as400/access/AS400JDBCPooledConnection.java b/src/main/java/com/ibm/as400/access/AS400JDBCPooledConnection.java
index 689fb764..fa54ae5c 100644
--- a/src/main/java/com/ibm/as400/access/AS400JDBCPooledConnection.java
+++ b/src/main/java/com/ibm/as400/access/AS400JDBCPooledConnection.java
@@ -66,7 +66,7 @@
 *  </li>  
 *  </ul>
 **/
-public class AS400JDBCPooledConnection implements PooledConnection
+public class AS400JDBCPooledConnection implements PooledConnection, AutoCloseable
 {
   static final String copyright = "Copyright (C) 1997-2010 International Business Machines Corporation and others.";