diff --git a/pom.xml b/pom.xml
index fd8c659..1de0aa2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,36 +1,80 @@
-<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/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>java.data</artifactId>
-    <version>0.1.2-SNAPSHOT</version>
-    <name>java.data</name>
-
-    <url>https://github.com/clojure/java.data/</url>
-    <description>Utilities for working with Java beans from Clojure</description>
-
-    <parent>
+<?xml version="1.0" encoding="UTF-8"?><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/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>adb</groupId>
+  <artifactId>java.data</artifactId>
+  <packaging>jar</packaging>
+  <version>0.1.2-SNAPSHOT</version>
+  <name>java.data</name>
+  <description>A fork of java.data with fixes for JAXB source generation issues.</description>
+  <licenses>
+    <license>
+      <name>Eclipse Public License</name>
+    </license>
+  </licenses>
+  <scm>
+    <connection>scm:git:git://github.com/dkmarley/java.data.git</connection>
+    <developerConnection>scm:git:ssh://git@github.com/dkmarley/java.data.git</developerConnection>
+    <tag>a6eee35cc7088d09c63a70111893dce9c1983a0d
+</tag>
+    <url>https://github.com/dkmarley/java.data</url>
+  </scm>
+  <build>
+    <sourceDirectory>src/main/clojure</sourceDirectory>
+    <testSourceDirectory>test</testSourceDirectory>
+    <resources>
+      <resource>
+        <directory>resources</directory>
+      </resource>
+    </resources>
+    <testResources>
+      <testResource>
+        <directory>resources</directory>
+      </testResource>
+    </testResources>
+    <directory>target</directory>
+    <outputDirectory>target/classes</outputDirectory>
+    <plugins/>
+  </build>
+  <repositories>
+    <repository>
+      <id>central</id>
+      <url>https://repo1.maven.org/maven2/</url>
+      <snapshots>
+        <enabled>false</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+    <repository>
+      <id>clojars</id>
+      <url>https://clojars.org/repo/</url>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+      <releases>
+        <enabled>true</enabled>
+      </releases>
+    </repository>
+  </repositories>
+  <dependencyManagement>
+    <dependencies/>
+  </dependencyManagement>
+  <dependencies>
+    <dependency>
       <groupId>org.clojure</groupId>
-      <artifactId>pom.contrib</artifactId>
-      <version>0.2.2</version>
-    </parent>
-
-    <developers>
-      <developer>
-        <name>Cosmin Stejerean</name>
-      </developer>
-    </developers>
-
-    <scm>
-      <connection>scm:git:git@github.com:clojure/java.data.git</connection>
-      <developerConnection>scm:git:git@github.com:clojure/java.data.git</developerConnection>
-      <url>git@github.com:clojure/java.data.git</url>
-    </scm>
-
-    <dependencies>
-      <dependency>
-        <groupId>org.clojure</groupId>
-        <artifactId>tools.logging</artifactId>
-        <version>0.2.3</version>
-      </dependency>
-    </dependencies>
+      <artifactId>clojure</artifactId>
+      <version>1.8.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.clojure</groupId>
+      <artifactId>tools.logging</artifactId>
+      <version>0.4.0</version>
+    </dependency>
+  </dependencies>
 </project>
+
+<!-- This file was autogenerated by Leiningen.
+  Please do not edit it directly; instead edit project.clj and regenerate it.
+  It should not be considered canonical data. For more information see
+  https://github.com/technomancy/leiningen -->
diff --git a/src/main/clojure/clojure/java/data.clj b/src/main/clojure/clojure/java/data.clj
index 8f3832a..33275eb 100644
--- a/src/main/clojure/clojure/java/data.clj
+++ b/src/main/clojure/clojure/java/data.clj
@@ -25,6 +25,20 @@
 (defn- get-property-descriptors [clazz]
   (.getPropertyDescriptors (java.beans.Introspector/getBeanInfo clazz)))
 
+(defn- list-property? [prop-descriptor]
+  (= java.util.List (.getPropertyType prop-descriptor)))
+
+(defn- boxed-boolean-property? [prop-descriptor]
+  (= Boolean (.getPropertyType prop-descriptor)))
+
+(defn- type-parameter
+  "Get the type parameter for a the generic return type of a method."
+  [method]
+  (-> method
+      (.getGenericReturnType)
+      (.getActualTypeArguments)
+      (first)))
+
 ;; getters
 
 (defn- is-getter [method]
@@ -34,13 +48,24 @@
   (fn [instance]
     (from-java (.invoke method instance nil))))
 
-(defn- add-getter-fn [the-map prop-descriptor]
-  (let [name (.getName prop-descriptor)
+(defn- boxed-boolean-getter
+  "Construct the getter name from the property and return the getter from 'class'."
+  [clazz property-name]
+  (let [getter-name (str "is" (.toUpperCase (subs property-name 0 1)) (subs property-name 1 (count property-name)))]
+    (.getDeclaredMethod clazz getter-name nil)))
+
+(defn- add-getter-fn
+  "JDK > 1.8 has a documented bug in the reflection API that means getReadMethod returns null for property descriptors
+  of type Boolean that correctly begin with 'is'. The only solution is a rather ugly workaround where we construct the
+  method name from the property name and use getDeclaredMethod on the owner class."
+  [the-map prop-descriptor clazz]
+  (let [name   (.getName prop-descriptor)
         method (.getReadMethod prop-descriptor)]
     (if (and (is-getter method) (not (= "class" name)))
       (assoc the-map (keyword name) (make-getter-fn method))
-      the-map)))
-
+      (if (boxed-boolean-property? prop-descriptor)
+        (assoc the-map (keyword name) (make-getter-fn (boxed-boolean-getter clazz name)))
+        the-map))))
 
 ;; setters
 
@@ -54,12 +79,23 @@
     (fn [instance value]
       (.invoke method instance (into-array [(to-java (get-setter-type method) value)]))))
 
-(defn- add-setter-fn [the-map prop-descriptor]
-  (let [name (.getName prop-descriptor)
+(defn- make-list-setter-fn
+  [list-method]
+  (fn [instance values]
+    (let [array-list (.invoke list-method instance nil)]
+      (doseq [value values]
+        (.add array-list (to-java (type-parameter list-method) value))))))
+
+(defn- add-setter-fn
+  "JAXB doesn't generate setters for lists so we need to modify the default add-setter-fn and then intern it."
+  [the-map prop-descriptor]
+  (let [name   (.getName prop-descriptor)
         method (.getWriteMethod prop-descriptor)]
     (if (is-setter method)
       (assoc the-map (keyword name) (make-setter-fn method))
-      the-map)))
+      (if (list-property? prop-descriptor)
+        (assoc the-map (keyword name) (make-list-setter-fn (.getReadMethod prop-descriptor)))
+        the-map))))
 
 (defn- add-array-methods [acls]
   (let [cls (.getComponentType acls)
@@ -131,8 +167,8 @@
   (let [clazz (.getClass instance)]
     (if (.isArray clazz)
       ((:from (add-array-methods clazz))
-       instance)
-      (let [getter-map (reduce add-getter-fn {} (get-property-descriptors clazz))]
+        instance)
+      (let [getter-map (reduce #(add-getter-fn %1 %2 clazz) {} (get-property-descriptors clazz))]
         (into {} (for [[key getter-fn] (seq getter-map)] [key (getter-fn instance)]))))))