diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb5a316
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+target
diff --git a/README.md b/README.md
index f38539e..a7094a2 100644
--- a/README.md
+++ b/README.md
@@ -4,25 +4,34 @@ USBtinLib
 USBtinLib is a Java library for accessing USBtin. USBtin is an USB to CAN
 interace (http://www.fischl.de/usbtin/).
 
+This is just a custom fork from the main code here: https://github.com/EmbedME/USBtinLib
+The author did not merge my pull request with the changes to use maven instead, so keeping my own fork then here.
+
 Build
 -----
-Ant is used to build the library from Java source code. To create the JAR file,
+Maven is used to build the library from Java source code. To create the JAR file,
 use
 ```
-ant jar
+mvn clean install
 ```
 
 USBtinLib depends on jSSC (Java Simple Serial Connector) - library for working
-with serial ports from Java. The jSSC library JAR file must be included in
-classpath.
+with serial ports from Java. The jSSC library is added automatically by maven when building it
 https://code.google.com/p/java-simple-serial-connector/
 
 
 Usage
 -----
 
-Add USBtinLib.jar to the Classpath or as Library to your project. E.g. in
-Netbeans: File -> Project Properties -> Libraries -> Compile -> Add JAR/Folder
+Add the following dependency to your maven project:
+
+```
+  <dependency>
+    <groupId>de.fischl.usbtin</groupId>
+    <artifactId>usbtin</artifactId>
+    <version>1.0-SNAPSHOT</version>
+  </dependency>
+```
 
 Import the package containing the library in your Java code:
 ```
diff --git a/build.xml b/build.xml
deleted file mode 100644
index 68f6847..0000000
--- a/build.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<project default="compile">
-
-    <property name="src" location="src"/>
-    <property name="build" location="build"/>
-    <property name="dist.dir"  location="dist"/>
-    <property name="doc.dir"  location="doc"/>
-
-    <property name="ant.build.javac.source" value="1.5"/>
-    <property name="ant.build.javac.target" value="1.5"/>
-
-    <path id="project.class.path">
-        <pathelement path="${classpath}"/>
-        <pathelement path="${build}"/>
-        <pathelement location="lib/jssc-2.8.0.jar"/>
-    </path>
-
-    <target name="clean">
-        <delete dir="${build}"/>
-        <delete dir="${dist.dir}"/>
-        <delete dir="${doc.dir}"/>
-    </target>
-
-    <target name="compile">
-        <mkdir dir="${build}"/>
-        <javac srcdir="${src}" destdir="${build}" includeantruntime="false" bootclasspath="/opt/jre1.5.0_22/lib/rt.jar">
-            <classpath refid="project.class.path"/>
-        </javac>
-    </target>
-
-    <target name="doc">
-        <delete dir="${doc.dir}"/>
-        <mkdir dir="${doc.dir}"/>
-        <javadoc sourcepath="${src}" destdir="${doc.dir}" packagenames="de.fischl.usbtin" >
-            <classpath refid="project.class.path"/>
-        </javadoc>
-    </target>
-
-    <target name="jar" depends="compile">
-        <mkdir dir="${dist.dir}"/>
-        <jar destfile="${dist.dir}/USBtinLib.jar" basedir="${build}">
-        </jar>
-    </target>
-
-</project>
diff --git a/lib/jssc-2.8.0.jar b/lib/jssc-2.8.0.jar
deleted file mode 100644
index d2b5c07..0000000
Binary files a/lib/jssc-2.8.0.jar and /dev/null differ
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..b427b75
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,31 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>de.fischl.usbtin</groupId>
+	<artifactId>usbtin</artifactId>
+	<version>1.0-SNAPSHOT</version>
+	<name>USBtinLib java library for accessing USBtin</name>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+	</properties>
+	<dependencies>
+		<dependency>
+			<groupId>org.scream3r</groupId>
+			<artifactId>jssc</artifactId>
+			<version>2.8.0</version>
+		</dependency>
+	</dependencies>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>2.3.2</version>
+				<configuration>
+					<source>1.7</source>
+					<target>1.7</target>
+				</configuration>
+			</plugin>
+		</plugins>
+	</build>
+</project>
diff --git a/src/de/fischl/usbtin/CANMessage.java b/src/main/java/de/fischl/usbtin/CANMessage.java
similarity index 100%
rename from src/de/fischl/usbtin/CANMessage.java
rename to src/main/java/de/fischl/usbtin/CANMessage.java
diff --git a/src/de/fischl/usbtin/CANMessageListener.java b/src/main/java/de/fischl/usbtin/CANMessageListener.java
similarity index 100%
rename from src/de/fischl/usbtin/CANMessageListener.java
rename to src/main/java/de/fischl/usbtin/CANMessageListener.java
diff --git a/src/de/fischl/usbtin/FilterChain.java b/src/main/java/de/fischl/usbtin/FilterChain.java
similarity index 100%
rename from src/de/fischl/usbtin/FilterChain.java
rename to src/main/java/de/fischl/usbtin/FilterChain.java
diff --git a/src/de/fischl/usbtin/FilterMask.java b/src/main/java/de/fischl/usbtin/FilterMask.java
similarity index 100%
rename from src/de/fischl/usbtin/FilterMask.java
rename to src/main/java/de/fischl/usbtin/FilterMask.java
diff --git a/src/de/fischl/usbtin/FilterValue.java b/src/main/java/de/fischl/usbtin/FilterValue.java
similarity index 100%
rename from src/de/fischl/usbtin/FilterValue.java
rename to src/main/java/de/fischl/usbtin/FilterValue.java
diff --git a/src/de/fischl/usbtin/USBtin.java b/src/main/java/de/fischl/usbtin/USBtin.java
similarity index 100%
rename from src/de/fischl/usbtin/USBtin.java
rename to src/main/java/de/fischl/usbtin/USBtin.java
diff --git a/src/de/fischl/usbtin/USBtinException.java b/src/main/java/de/fischl/usbtin/USBtinException.java
similarity index 100%
rename from src/de/fischl/usbtin/USBtinException.java
rename to src/main/java/de/fischl/usbtin/USBtinException.java