diff --git a/scripts/gen_hashed_bin.py b/scripts/gen_hashed_bin.py
new file mode 100755
index 0000000..11d5ecc
--- /dev/null
+++ b/scripts/gen_hashed_bin.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python
+#
+# Copyright (c) 2014, Linaro Limited
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# 1. Redistributions of source code must retain the above copyright notice,
+# this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+import argparse
+import sys
+import shutil
+import os
+import struct
+import hashlib
+
+
+def write_header(outf, init_size, args, paged_size):
+	magic = 0x4554504f # 'OPTE'
+	version = 1;
+	outf.write(struct.pack('<IBBHIIIII', \
+		magic, version, args.arch, args.flags, init_size, \
+		args.init_load_addr_hi, args.init_load_addr_lo, \
+		args.init_mem_usage, paged_size))
+	
+
+def append_to(outf, start_offs, in_fname, max_bytes=0xffffffff):
+	#print "Appending %s@0x%x 0x%x bytes at position 0x%x" % \
+		#( in_fname, start_offs, max_bytes, int(outf.tell()) )
+	inf = open(in_fname, 'r');
+	inf.seek(start_offs)
+	while True :
+		nbytes = min(16 * 1024, max_bytes)
+		if nbytes == 0 :
+			break
+		#print "Reading %s %d bytes" % (in_fname, nbytes)
+		buf = inf.read(nbytes)
+		if not buf :
+			break
+		outf.write(buf)
+		max_bytes -= len(buf)
+	inf.close()
+
+def append_hashes(outf, in_fname):
+	page_size = 4 * 1024
+
+	inf = open(in_fname, 'r')
+	while True :
+		page = inf.read(page_size)
+		if len(page) == page_size :
+			#print "Writing hash at position 0x%x" % \
+				#int(outf.tell())
+			outf.write(hashlib.sha256(page).digest())
+		elif len(page) == 0 :
+			break
+		else :
+			print "Error: short read, got " + repr(len(page))
+			sys.exit(1)
+
+	inf.close()
+
+def int_parse(str):
+	return int(str, 0)
+
+def get_args():
+	parser = argparse.ArgumentParser()
+	parser.add_argument('--arch', required=True, \
+		type=int, choices=[0, 1], \
+		help='Architecture: ARM32 = 0, ARM64 = 1')
+
+	parser.add_argument('--flags', \
+		type=int, default=0, \
+		help='Flags, currently none defined')
+
+	parser.add_argument('--init_size', \
+		required=True, type=int_parse, \
+		help='Size of initialization part of binary')
+
+	parser.add_argument('--init_load_addr_hi', \
+		type=int_parse, default=0, \
+		help='Upper 32 bits of load address of binary')
+
+	parser.add_argument('--init_load_addr_lo', \
+		required=True, type=int_parse, \
+		help='Lower 32 bits of load address of binary')
+
+	parser.add_argument('--init_mem_usage', \
+		required=True, type=int_parse, \
+		help='Total amount of used memory when initializing');
+
+	parser.add_argument('--tee_pager_bin', \
+		required=True, \
+		help='The input tee_pager.bin')
+
+	parser.add_argument('--tee_pagable_bin', \
+		required=True, \
+		help='The input tee_pagable.bin')
+
+	parser.add_argument('--out', \
+		required=True, type=argparse.FileType('w'), \
+		help='The output tee.bin')
+
+	return parser.parse_args();
+
+def main():
+	args = get_args()
+	init_bin_size 	  = args.init_size
+	tee_pager_fname   = args.tee_pager_bin
+	tee_pagable_fname = args.tee_pagable_bin
+	outf		  = args.out
+
+	write_header(outf, 0, args, 0)
+	header_size = outf.tell();
+	append_to(outf, 0, tee_pager_fname)
+	append_to(outf, 0, tee_pagable_fname, init_bin_size)
+	append_hashes(outf, tee_pagable_fname)
+	init_size = outf.tell() - header_size;
+	append_to(outf, init_bin_size, tee_pagable_fname)
+	paged_size = outf.tell() - init_size - header_size;
+
+	outf.seek(0)
+	#print "init_size 0x%x" % init_size
+	write_header(outf, init_size, args, paged_size)
+
+	outf.close()
+
+if __name__ == "__main__":
+	main()