diff --git a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 065dfe9a..40319aba 100644
--- a/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/hikaricp-java6/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -16,6 +16,7 @@
 
 package com.zaxxer.hikari;
 
+import java.io.Closeable;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -36,7 +37,7 @@ import com.zaxxer.hikari.util.DriverDataSource;
  *
  * @author Brett Wooldridge
  */
-public class HikariDataSource extends HikariConfig implements DataSource
+public class HikariDataSource extends HikariConfig implements DataSource, Closeable
 {
    private static final Logger LOGGER = LoggerFactory.getLogger(HikariDataSource.class);
 
diff --git a/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java b/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java
index 59600a15..f55aa0f7 100644
--- a/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java
+++ b/hikaricp/src/main/java/com/zaxxer/hikari/HikariDataSource.java
@@ -16,6 +16,7 @@
 
 package com.zaxxer.hikari;
 
+import java.io.Closeable;
 import java.io.PrintWriter;
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -36,7 +37,7 @@ import com.zaxxer.hikari.util.DriverDataSource;
  *
  * @author Brett Wooldridge
  */
-public class HikariDataSource extends HikariConfig implements DataSource
+public class HikariDataSource extends HikariConfig implements DataSource, Closeable
 {
    private static final Logger LOGGER = LoggerFactory.getLogger(HikariDataSource.class);