diff --git a/README.md b/README.md
index 8bae11754675bfd11d79d2aca2e9accd6620ed86..44f456a1d499816423550738650d4d9b86bdd72c 100644
--- a/README.md
+++ b/README.md
@@ -51,7 +51,7 @@ To build a 64bit Qemu image:
freedombone-image -t qemu-x86_64 -s 8G
-Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro.
Checklist
=========
diff --git a/doc/EN/installation.org b/doc/EN/installation.org
index 64b37a04e0cba3144a37cbb23d26c07d2c16c516..443f1c10667e947520fa0b9549973f2f5990eb48 100644
--- a/doc/EN/installation.org
+++ b/doc/EN/installation.org
@@ -70,7 +70,7 @@ To build a 64bit Qemu image:
freedombone-image -t qemu-x86_64 -s 8G
#+END_SRC
-Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro.
* Checklist
Before installing Freedombone you will need a few things.
@@ -102,6 +102,7 @@ Currently the following boards are supported:
* [[http://beagleboard.org/BLACK][Beaglebone Black]]
* [[http://linux-sunxi.org/Cubietech_Cubieboard2][Cubieboard 2]]
* [[https://linux-sunxi.org/Cubietruck][Cubietruck (Cubieboard 3)]]
+ * [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME/open-source-hardware][olinuxino Lime]]
* [[https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware][olinuxino Lime2]]
* [[https://www.olimex.com/Products/OlinuXino/A20/A20-OlinuXino-MICRO/open-source-hardware][olinuxino Micro]]
diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz
index 00861c85db8a1275e988d65ffe5c901da30e4c51..2ee33e74eba5434a76d6ed1c8afbd73ba698a32b 100644
Binary files a/man/freedombone-image.1.gz and b/man/freedombone-image.1.gz differ
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 98ef75e46230be612f37fea5078bd25d37c8bef4..d556d87baf4bd40831e37f8fce315ff431fe73dc 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -798,6 +798,10 @@ case "$MACHINE" in
dd if=$rootdir/usr/lib/u-boot/Cubieboard2/u-boot-sunxi-with-spl.bin of="$image" \
seek=8 conv=notrunc bs=1k
;;
+ a20-olinuxino-lime)
+ dd if=$rootdir/usr/lib/u-boot/A20-OLinuXino-Lime/u-boot-sunxi-with-spl.bin \
+ of="$image" seek=8 conv=notrunc bs=1k
+ ;;
esac
if $use_eatmydata ; then
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index 774762a82ddff78c46df4139cd1fbeeed757f966..74dd5f0ec90b32f2f1cf912308fad7288feafa8c 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -201,6 +201,10 @@ case "$MACHINE" in
a20_setup_boot sun7i-a20-cubietruck.dtb
enable_serial_console ttyS0
;;
+ a20-olinuxino-lime)
+ a20_setup_boot sun7i-a20-olinuxino-lime.dtb
+ enable_serial_console ttyS0
+ ;;
a20-olinuxino-lime2)
a20_setup_boot sun7i-a20-olinuxino-lime2.dtb
enable_serial_console ttyS0
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index 46832d9ce18b86edbb31e2036406b83a09be6121..0707b1abb5ec066d0a49149193337f04a25b23ed 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -74,7 +74,6 @@ logrotate module-init-tools netbase rsyslog udev debian-archive-keyring"
beaglebone_pkgs="linux-image-armmp u-boot-tools u-boot"
# Packages needed on the Allwinner A20 devices:
-# - Cubieboard2
a20_pkgs="linux-image-armmp-lpae u-boot-tools u-boot u-boot-sunxi"
# Packages needed for self-hosted development
@@ -96,7 +95,7 @@ case "$MACHINE" in
--roottype btrfs \
"
;;
- cubietruck | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2)
+ cubietruck | a20-olinuxino-lime | a20-olinuxino-lime2 | a20-olinuxino-micro | cubieboard2)
extra_pkgs="$a20_pkgs"
extra_opts="\
--variant minbase \
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index 0a77f08cb56e8d7c47fb316125b5782dd3c80534..d46e4a4abdf7ce5ae0e3f121360dcbd27af2a3c4 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -111,6 +111,17 @@ cubietruck: prep
$(SIGN)
@echo "Build complete."
+# build A20 OLinuXino Lime SD card image
+a20-olinuxino-lime: prep
+ $(eval ARCHITECTURE = armhf)
+ $(eval MACHINE = a20-olinuxino-lime)
+ $(eval IMAGE = $(NAME).img)
+ $(MAKE_IMAGE)
+ rm -f $(ARCHIVE)
+ $(XZ) $(IMAGE)
+ @echo ""
+ $(SIGN)
+
# build A20 OLinuXino Lime2 SD card image
a20-olinuxino-lime2: prep
$(eval ARCHITECTURE = armhf)
diff --git a/website/EN/installation.html b/website/EN/installation.html
index 35a293c4dc1967a1d94f614788b872a14a4903cf..e730bb6c58748c2210d1628da41013fd4ecd4c6c 100644
--- a/website/EN/installation.html
+++ b/website/EN/installation.html
@@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<!-- 2016-01-14 Thu 11:07 -->
+<!-- 2016-01-28 Thu 09:27 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title></title>
@@ -281,7 +281,7 @@ To build a 64bit Qemu image:
</div>
<p>
-Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime, olinuxino-lime2 and olinuxino-micro.
</p>
</div>
</div>
@@ -342,6 +342,7 @@ Currently the following boards are supported:
<li><a href="http://beagleboard.org/BLACK">Beaglebone Black</a></li>
<li><a href="http://linux-sunxi.org/Cubietech_Cubieboard2">Cubieboard 2</a></li>
<li><a href="https://linux-sunxi.org/Cubietruck">Cubietruck (Cubieboard 3)</a></li>
+<li><a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME/open-source-hardware">olinuxino Lime</a></li>
<li><a href="https://www.olimex.com/Products/OLinuXino/A20/A20-OLinuXIno-LIME2/open-source-hardware">olinuxino Lime2</a></li>
<li><a href="https://www.olimex.com/Products/OlinuXino/A20/A20-OlinuXino-MICRO/open-source-hardware">olinuxino Micro</a></li>
</ul>