diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f5d49c8..69c50d1 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,13 @@
 Changelog
 =========
 
+2015-06-29
+----------
+Alex Adriaanse:
+	* Fix DKMS kernel version error
+	* Add support for Btrfs
+	* Add EC2 Jessie HVM manifest
+
 2015-05-08
 ----------
 Alexandre Derumier:
diff --git a/bootstrapvz/base/manifest-schema.yml b/bootstrapvz/base/manifest-schema.yml
index ed4b3f0..c3f2bda 100644
--- a/bootstrapvz/base/manifest-schema.yml
+++ b/bootstrapvz/base/manifest-schema.yml
@@ -150,7 +150,7 @@ definitions:
     type: object
     properties:
       filesystem:
-        enum: [ext2, ext3, ext4, xfs]
+        enum: [ext2, ext3, ext4, xfs, btrfs]
       format_command:
         items: {type: string}
         minItems: 1
diff --git a/bootstrapvz/providers/ec2/tasks/network.py b/bootstrapvz/providers/ec2/tasks/network.py
index 4d247c5..b707600 100644
--- a/bootstrapvz/providers/ec2/tasks/network.py
+++ b/bootstrapvz/providers/ec2/tasks/network.py
@@ -64,4 +64,4 @@ AUTOINSTALL="yes"
 		for task in ['add', 'build', 'install']:
 			# Invoke DKMS task using specified kernel module (-m) and version (-v)
 			log_check_call(['chroot', info.root,
-			                'dkms', task, '-m', 'ixgbevf', '-v', version])
+			                'dkms', task, '-m', 'ixgbevf', '-v', version, '-k', info.kernel_version])
diff --git a/manifests/official/ec2/ebs-jessie-amd64-hvm.yml b/manifests/official/ec2/ebs-jessie-amd64-hvm.yml
new file mode 100644
index 0000000..4343938
--- /dev/null
+++ b/manifests/official/ec2/ebs-jessie-amd64-hvm.yml
@@ -0,0 +1,33 @@
+---
+provider:
+  name: ec2
+  virtualization: hvm
+  enhanced_networking: simple
+  # credentials:
+  #   access-key: AFAKEACCESSKEYFORAWS
+  #   secret-key: thes3cr3tkeyf0ryourawsaccount/FS4d8Qdva
+bootstrapper:
+  workspace: /target
+image:
+  name: debian-{system.release}-{system.architecture}-{provider.virtualization}-{%Y}-{%m}-{%d}-ebs
+  description: Debian {system.release} {system.architecture}
+system:
+  release: jessie
+  architecture: amd64
+  bootloader: extlinux
+  charmap: UTF-8
+  locale: en_US
+  timezone: UTC
+volume:
+  backing: ebs
+  partitions:
+    type: none
+    root:
+      filesystem: ext4
+      size: 8GiB
+packages:
+  mirror: http://cloudfront.debian.net/debian
+plugins:
+  cloud_init:
+    metadata_sources: Ec2
+    username: admin