diff --git a/README.md b/README.md
index 0a0c548f818a5a96365ce83da2ff694fb1b16e65..20b47014ceff5ac4acef01e7ea5cdb2b180be4a1 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 and olinuxino-lime2.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
Checklist
=========
@@ -87,6 +87,7 @@ Currently the following boards are supported:
Cubieboard 2
Cubietruck (Cubieboard 3)
olinuxino Lime2
+ olinuxino Micro
If there is no existing image available then you can build one from scratch. See the section above on how to do that. If an existing image is available then you can download it and check the signature with:
diff --git a/doc/EN/installation.org b/doc/EN/installation.org
index 2cd0de83990372ea44359cbe2ca5fec792cdc08b..710e487490a8225c4dba534fd0701f2dee3c1f12 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 and olinuxino-lime2.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
* Checklist
Before installing Freedombone you will need a few things.
@@ -103,6 +103,7 @@ Currently the following boards are supported:
* [[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-LIME2/open-source-hardware][olinuxino Lime2]]
+ * [[https://www.olimex.com/Products/OlinuXino/A20/A20-OlinuXino-MICRO/open-source-hardware][olinuxino Micro]]
If there is no existing image available then you can build one from scratch. See the section above on how to do that. If an existing image is available then you can download it and check the signature with:
diff --git a/src/freedombone-image-hardware-setup b/src/freedombone-image-hardware-setup
index bf40b439cf2592d4cf76e3b2321259e2c0f5fc10..774762a82ddff78c46df4139cd1fbeeed757f966 100755
--- a/src/freedombone-image-hardware-setup
+++ b/src/freedombone-image-hardware-setup
@@ -205,6 +205,10 @@ case "$MACHINE" in
a20_setup_boot sun7i-a20-olinuxino-lime2.dtb
enable_serial_console ttyS0
;;
+ a20-olinuxino-micro)
+ a20_setup_boot sun7i-a20-olinuxino-micro.dtb
+ enable_serial_console ttyS0
+ ;;
cubieboard2)
a20_setup_boot sun7i-a20-cubieboard2.dtb
enable_serial_console ttyS0
diff --git a/src/freedombone-image-make b/src/freedombone-image-make
index b41b9544f8178acefb60b99825f2ea018728f58d..bde07e9b4383f9aef140d60a2710ea4ee271a928 100755
--- a/src/freedombone-image-make
+++ b/src/freedombone-image-make
@@ -95,7 +95,7 @@ case "$MACHINE" in
--roottype btrfs \
"
;;
- cubietruck | a20-olinuxino-lime2 | cubieboard2)
+ cubietruck | 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 51275f825c1a88621d01b58443e2addfdc9b02ba..19499b9bc33ce1bca2aec7bcf1cbb8b0adbda838 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -118,6 +118,16 @@ a20-olinuxino-lime2: prep
$(SIGN)
@echo "Build complete."
+# build A20 OLinuXino Micro SD card image
+a20-olinuxino-micro: prep
+ $(eval ARCHITECTURE = armhf)
+ $(eval MACHINE = a20-olinuxino-micro)
+ $(MAKE_IMAGE)
+ $(TAR) $(ARCHIVE) $(IMAGE)
+ @echo ""
+ $(SIGN)
+ @echo "Build complete."
+
# build an i386 image
i386: prep
$(eval ARCHITECTURE = i386)
diff --git a/website/EN/installation.html b/website/EN/installation.html
index 0fae9ac0d4e400057647103171f90d8ce9e25925..cce9e14c6987e45daf711d5c68c53c490a4940ae 100644
--- a/website/EN/installation.html
+++ b/website/EN/installation.html
@@ -3,15 +3,15 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
-<title></title>
-<!-- 2016-01-07 Thu 19:24 -->
+<!-- 2016-01-08 Fri 14:41 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
+<meta name="viewport" content="width=device-width, initial-scale=1" />
+<title></title>
<meta name="generator" content="Org-mode" />
<meta name="author" content="Bob Mottram" />
<meta name="description" content="Turn the Beaglebone Black into a personal communications server"
/>
<meta name="keywords" content="freedombox, debian, beaglebone, hubzilla, email, web server, home server, internet, censorship, surveillance, social network, irc, jabber" />
-<meta name="viewport" content="width=device-width, initial-scale=1" />
<style type="text/css">
<!--/*--><![CDATA[/*><!--*/
.title { text-align: center;
@@ -281,7 +281,7 @@ To build a 64bit Qemu image:
</div>
<p>
-Other supported boards are cubieboard2, cubietruck and olinuxino-lime2.
+Other supported boards are cubieboard2, cubietruck, olinuxino-lime2 and olinuxino-micro.
</p>
</div>
</div>
@@ -343,6 +343,7 @@ Currently the following boards are supported:
<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-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>
<p>