diff --git a/.classpath b/.classpath
index dc543d95..77e8068a 100644
--- a/.classpath
+++ b/.classpath
@@ -17,6 +17,5 @@
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/hsqldb-r5836.jar"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/lib/org/hsqldb/hsqldb/maven-metadata.xml b/lib/org/hsqldb/hsqldb/maven-metadata.xml
new file mode 100644
index 00000000..c2b0ba09
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/maven-metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+  <groupId>org.hsqldb</groupId>
+  <artifactId>hsqldb</artifactId>
+  <versioning>
+    <release>r5836</release>
+    <versions>
+      <version>r5836</version>
+    </versions>
+    <lastUpdated>20180929092113</lastUpdated>
+  </versioning>
+</metadata>
diff --git a/lib/org/hsqldb/hsqldb/maven-metadata.xml.md5 b/lib/org/hsqldb/hsqldb/maven-metadata.xml.md5
new file mode 100644
index 00000000..e54c38b1
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/maven-metadata.xml.md5
@@ -0,0 +1 @@
+1d7f55d30c3542b76ef961749da3c40f
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/maven-metadata.xml.sha1 b/lib/org/hsqldb/hsqldb/maven-metadata.xml.sha1
new file mode 100644
index 00000000..41a9f454
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/maven-metadata.xml.sha1
@@ -0,0 +1 @@
+8bb6a2ace951f1805b9baac61bca3a548e4299cc
\ No newline at end of file
diff --git a/lib/hsqldb-r5836.jar b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar
similarity index 100%
rename from lib/hsqldb-r5836.jar
rename to lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.md5 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.md5
new file mode 100644
index 00000000..127cbd95
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.md5
@@ -0,0 +1 @@
+7d59b5596e655b2e4fd78796e7a3896b
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.sha1 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.sha1
new file mode 100644
index 00000000..73d9c685
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.jar.sha1
@@ -0,0 +1 @@
+a7d55ed9afd753fd9c620796f7d88f67a554711c
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom
new file mode 100644
index 00000000..ec5069a1
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.hsqldb</groupId>
+  <artifactId>hsqldb</artifactId>
+  <version>r5836</version>
+</project>
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.md5 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.md5
new file mode 100644
index 00000000..74e8c4f7
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.md5
@@ -0,0 +1 @@
+4d667eead4590a45fd75787cd6125701
\ No newline at end of file
diff --git a/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.sha1 b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.sha1
new file mode 100644
index 00000000..12b17562
--- /dev/null
+++ b/lib/org/hsqldb/hsqldb/r5836/hsqldb-r5836.pom.sha1
@@ -0,0 +1 @@
+f77180541070ce99899dc281b1c4469a6b9656f0
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 08a54ee9..dfd08a3d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,13 +17,18 @@
 			</plugin>
 		</plugins>
 	</build>
+	<repositories>
+		<repository>
+			<id>project.local</id>
+			<name>project</name>
+			<url>file:${project.basedir}/lib</url>
+		</repository>
+	</repositories>
 	<dependencies>
 		<dependency>
 			<groupId>org.hsqldb</groupId>
 			<artifactId>hsqldb</artifactId>
 			<version>r5836</version>
-			<scope>system</scope>
-			<systemPath>${project.basedir}/lib/hsqldb-r5836.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.googlecode.json-simple</groupId>