diff --git a/board/beaglebone/post-image.sh b/board/beaglebone/post-image.sh
new file mode 100755
index 000000000..7441d07a0
--- /dev/null
+++ b/board/beaglebone/post-image.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# post-image.sh for BeagleBone
+# 2014, Marcin Jabrzyk <marcin.jabrzyk@gmail.com>
+
+# copy the uEnv.txt to the output/images directory
+cp board/beaglebone/uEnv.txt $BINARIES_DIR/uEnv.txt
diff --git a/board/beaglebone/readme.txt b/board/beaglebone/readme.txt
new file mode 100644
index 000000000..c6d0aa0cd
--- /dev/null
+++ b/board/beaglebone/readme.txt
@@ -0,0 +1,62 @@
+BeagleBone
+
+Intro
+=====
+To be able to use BeagleBone board with the images generated by
+Buildroot, you have prepare the SDCard.
+
+How to build it
+===============
+
+  $ make beaglebone_defconfig
+
+Then you can edit the build options using
+
+  $ make menuconfig
+
+Compile all and build rootfs image:
+
+  $ make
+
+Result of the build
+-------------------
+
+After building, you should get a tree like this:
+
+  output/images/
+  ├── am335x-boneblack.dtb
+  ├── am335x-bone.dtb
+  ├── MLO
+  ├── rootfs.ext2
+  ├── u-boot.img
+  ├── uEnv.txt
+  └── zImage
+
+
+Prepare you SDCard
+==================
+
+You need to prepare first partition in fat32 and marked as bootable,
+and second where you will write rootfs.
+
+Copy the files to boot partition
+
+  $ cp MLO u-boot.img zImage uEnv.txt *.dtb /media/zzzzz
+
+where /media/zzzzz is the mount point
+Then you need to write the rootfs image onto SDCard:
+
+  # dd if=rootfs.ext2 of=/dev/xxxxx
+
+where /dev/xxxxx is the second partition. Use:
+
+  # fdisk -l
+
+to check for correct one.
+
+Finish
+======
+
+Unmount all mounted SDCard partitions and insert the card to BeagleBone.
+Hold the "BOOT" button and apply power. Then release the "BOOT" button.
+The output is available on the serial console.
diff --git a/board/beaglebone/uEnv.txt b/board/beaglebone/uEnv.txt
new file mode 100644
index 000000000..d63843239
--- /dev/null
+++ b/board/beaglebone/uEnv.txt
@@ -0,0 +1,3 @@
+bootpart=0:1
+bootdir=
+uenvcmd=run loaduimage;run loadramdisk;run findfdt;run loadfdt;run ramboot
diff --git a/configs/beaglebone_defconfig b/configs/beaglebone_defconfig
index f825fa940..ddb583c8f 100644
--- a/configs/beaglebone_defconfig
+++ b/configs/beaglebone_defconfig
@@ -8,6 +8,7 @@ BR2_TARGET_GENERIC_HOSTNAME="beaglebone"
 BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_DEVTMPFS=y
 BR2_TARGET_GENERIC_GETTY_PORT="ttyO0"
 # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW is not set
+BR2_ROOTFS_POST_IMAGE_SCRIPT="board/beaglebone/post-image.sh"
 
 # filesystem
 BR2_PACKAGE_AM33X_CM3=y