 ---
  include/config_mender.h   | 69 +++++++++++++++++++++++++++++++++++++++++++++++
  include/env_default.h     |  3 +++
- include/env_mender.h      | 59 ++++++++++++++++++++++++++++++++++++++++
+ include/env_mender.h      | 64 +++++++++++++++++++++++++++++++++++++++++++
  scripts/Makefile.autoconf |  3 ++-
- 4 files changed, 133 insertions(+), 1 deletion(-)
+ 4 files changed, 138 insertions(+), 1 deletion(-)
  create mode 100644 include/config_mender.h
  create mode 100644 include/env_mender.h
 

 #endif
diff --git a/include/env_mender.h b/include/env_mender.h
new file mode 100644
index 0000000..bb3939f
--- /dev/null
+++ b/include/env_mender.h
@@ -0,0 +1,59 @@
+/*
+  Copyright (C) 2016  Mender Software
+

From b701b72baa0ba88561e101cca9efe8772207c354 Mon Sep 17 00:00:00 2001
From: Kristian Amlie <kristian.amlie@mender.io>
Date: Fri, 12 Aug 2016 10:15:11 +0200
Subject: [PATCH] Generic boot code for Mender.
