diff --git a/pom.xml b/pom.xml
index 57758cdb..4f02c295 100644
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
 		hyper-text driven REST web services.
 	</description>
 
-	<inceptionYear>2012-2015</inceptionYear>
+	<inceptionYear>2012-2016</inceptionYear>
 
 	<organization>
 		<name>Pivotal, Inc.</name>
@@ -471,7 +471,7 @@
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
-			<version>1.16.4</version>
+			<version>1.16.8</version>
 			<scope>provided</scope>
 		</dependency>
 
diff --git a/src/main/java/org/springframework/hateoas/alps/Alps.java b/src/main/java/org/springframework/hateoas/alps/Alps.java
index 44277dbe..5e6e7acc 100644
--- a/src/main/java/org/springframework/hateoas/alps/Alps.java
+++ b/src/main/java/org/springframework/hateoas/alps/Alps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.springframework.hateoas.alps;
 
-import java.util.List;
-
+import lombok.Builder;
 import lombok.Value;
-import lombok.experimental.Builder;
+
+import java.util.List;
 
 import org.springframework.hateoas.alps.Descriptor.DescriptorBuilder;
 import org.springframework.hateoas.alps.Doc.DocBuilder;
diff --git a/src/main/java/org/springframework/hateoas/alps/Descriptor.java b/src/main/java/org/springframework/hateoas/alps/Descriptor.java
index cb5c5b6f..75310976 100644
--- a/src/main/java/org/springframework/hateoas/alps/Descriptor.java
+++ b/src/main/java/org/springframework/hateoas/alps/Descriptor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,10 +15,10 @@
  */
 package org.springframework.hateoas.alps;
 
-import java.util.List;
-
+import lombok.Builder;
 import lombok.Value;
-import lombok.experimental.Builder;
+
+import java.util.List;
 
 /**
  * A value object for an ALPS descriptor.
diff --git a/src/main/java/org/springframework/hateoas/alps/Doc.java b/src/main/java/org/springframework/hateoas/alps/Doc.java
index bc3077d5..7e942587 100644
--- a/src/main/java/org/springframework/hateoas/alps/Doc.java
+++ b/src/main/java/org/springframework/hateoas/alps/Doc.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,8 +16,8 @@
 package org.springframework.hateoas.alps;
 
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Value;
-import lombok.experimental.Builder;
 
 import org.springframework.util.Assert;
 
diff --git a/src/main/java/org/springframework/hateoas/alps/Ext.java b/src/main/java/org/springframework/hateoas/alps/Ext.java
index 42b4f7c3..91e83782 100644
--- a/src/main/java/org/springframework/hateoas/alps/Ext.java
+++ b/src/main/java/org/springframework/hateoas/alps/Ext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 the original author or authors.
+ * Copyright 2014-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,8 +15,8 @@
  */
 package org.springframework.hateoas.alps;
 
+import lombok.Builder;
 import lombok.Value;
-import lombok.experimental.Builder;
 
 /**
  * A value object for an ALPS ext element.
diff --git a/template.mf b/template.mf
index 88419dea..d42f7584 100644
--- a/template.mf
+++ b/template.mf
@@ -8,6 +8,7 @@ Import-Template:
  javax.servlet.*;version="[2.5,4.0)";resolution:=optional,
  javax.ws.rs.*;version="${jaxrs.version:[=.=.=,+1.0.0)}";resolution:=optional,
  javax.xml.bind.*;version="0",
+ lombok.*;version="0";resolution:=optional,
  net.minidev.json.*;version="${minidevjson.version:[=.=.=,+1.0.0)}";resolution:=optional,
  org.aopalliance.*;version="[1.0.0,2.0.0)";resolution:=optional,
  org.atteo.evo.inflector.*;version="${evo.version:[=.=.=,+1.0.0)}";resolution:=optional,