Index: generic/src/lib/elf32.c
===================================================================
--- generic/src/lib/elf32.c	(revision 7a255e69a7f6282e3f17ca1a0ec5fe58840206b9)
+++ generic/src/lib/elf32.c	(revision a2a46ba180ede6fa62fc39caa28877a06ce899a4)
@@ -27,5 +27,5 @@
  */
 
-#include <elf32.h>
+#include <elf.h>
 
 /** 32bit ELF loader
@@ -36,4 +36,23 @@
  */
 int elf32_load(__address header, as_t * as) {
-	return EE_UNSUPPORTED;
+	elf32_header_t * e_header;
+
+	e_header = (elf32_header_t *) header;
+	
+	/* Identify ELF */
+	if (	e_header->e_ident[EI_MAG0] != ELFMAG0 || e_header->e_ident[EI_MAG1] != ELFMAG1 || 
+		e_header->e_ident[EI_MAG2] != ELFMAG2 || e_header->e_ident[EI_MAG3] != ELFMAG3
+		) {
+		return EE_INVALID;
+	}
+	
+	/* Identify ELF compatibility */
+	if (	e_header->e_ident[EI_DATA] != ELF_DATA_ENCODING || e_header->e_machine != ELF_MACHINE || 
+		e_header->e_ident[EI_VERSION] != EV_CURRENT || e_header->e_ident[EI_CLASS] != ELF_CLASS
+		) {
+		return EE_UNSUPPORTED;
+	}
+	
+
+	return EE_UNSUPPORTED;	
 }
Index: generic/src/lib/elf64.c
===================================================================
--- generic/src/lib/elf64.c	(revision a2a46ba180ede6fa62fc39caa28877a06ce899a4)
+++ generic/src/lib/elf64.c	(revision a2a46ba180ede6fa62fc39caa28877a06ce899a4)
@@ -0,0 +1,39 @@
+/*
+ * Copyright (C) 2006 Sergey Bondari
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ * - 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.
+ * - The name of the author may not be used to endorse or promote products
+ *   derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+ */
+
+#include <elf.h>
+#include <elf64.h>
+/** 64bit ELF loader
+ *
+ * @param header Pointer to ELF header in memory
+ * @param as Created and properly mapped address space
+ * @return EE_OK on success
+ */
+int elf64_load(__address header, as_t * as) {
+	return EE_UNSUPPORTED;	
+}