diff --git a/examples/thttpd/Makefile b/examples/thttpd/Makefile
index 321cccde53..2d9b271a06 100644
--- a/examples/thttpd/Makefile
+++ b/examples/thttpd/Makefile
@@ -47,6 +47,7 @@ OBJS	= $(AOBJS) $(COBJS)
 BIN	= lib$(CONFIG_EXAMPLE)$(LIBEXT)
 
 all:	$(BIN)
+.PHONY:	clean headers
 
 $(AOBJS): %$(OBJEXT): %.S
 	$(call ASSEMBLE, $<, $@)
@@ -54,7 +55,10 @@ $(AOBJS): %$(OBJEXT): %.S
 $(COBJS): %$(OBJEXT): %.c
 	$(call COMPILE, $<, $@)
 
-$(BIN):	$(OBJS)
+headers:
+	@$(MAKE) -C content TOPDIR=$(TOPDIR) CROSSDEV=$(CROSSDEV)
+
+$(BIN):	headers $(OBJS)
 	@( for obj in $(OBJS) ; do \
 		$(call ARCHIVE, $@, $${obj}); \
 	done ; )
@@ -67,6 +71,7 @@ depend: .depend
 
 clean:
 	@rm -f $(BIN) *~ .*.swp
+	@make -C content clean TOPDIR=$(TOPDIR) CROSSDEV=$(CROSSDEV)
 	$(call CLEAN)
 
 distclean: clean
diff --git a/examples/thttpd/content/Makefile b/examples/thttpd/content/Makefile
new file mode 100644
index 0000000000..4a25e2e5f3
--- /dev/null
+++ b/examples/thttpd/content/Makefile
@@ -0,0 +1,96 @@
+############################################################################
+# examples/thttpd/content/Makefile
+#
+#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# 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.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# 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 OWNER 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.
+#
+############################################################################
+
+SUBDIRS		= hello
+
+THTTPD_DIR	= $(TOPDIR)/examples/thttpd
+CONTENT_DIR	= $(THTTPD_DIR)/content
+ROMFS_DIR	= $(CONTENT_DIR)/romfs
+ROMFS_IMG	= $(CONTENT_DIR)/romfs.img
+ROMFS_HDR	= $(CONTENT_DIR)/romfs.h
+SYMTAB		= $(CONTENT_DIR)/symtab.h
+
+define DIR_template
+$(1)_$(2):
+	@$(MAKE) -C $(1) $(3) TOPDIR=$(TOPDIR) ROMFS_DIR=$(ROMFS_DIR) CROSSDEV=$(CROSSDEV)
+endef
+
+all: $(ROMFS_HDR) $(SYMTAB)
+.PHONY: all build clean install populate
+
+$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),build, all)))
+$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),clean,clean)))
+$(foreach DIR, $(SUBDIRS), $(eval $(call DIR_template,$(DIR),install,install)))
+
+# Build program(s) in each sud-directory 
+
+build: $(foreach DIR, $(SUBDIRS), $(DIR)_build)
+
+# Install each program in the romfs directory
+
+install: $(foreach DIR, $(SUBDIRS), $(DIR)_install)
+
+# Create the romfs directory
+
+$(ROMFS_DIR):
+	@mkdir $(ROMFS_DIR)
+
+# Populate the romfs directory
+
+populate:  $(ROMFS_DIR) build install
+
+# Create the romfs.img file from the populated romfs directory
+
+$(ROMFS_IMG): populate
+	@genromfs -f $@ -d $(ROMFS_DIR) -V "THTTPDTEST"
+
+# Create the romfs.h header file from the romfs.img file
+
+$(ROMFS_HDR) : $(ROMFS_IMG)
+	@(cd $(CONTENT_DIR); xxd -i romfs.img | sed -e "s/^unsigned/static const unsigned/g" >$@)
+
+# Create the exported symbol table list from the derived *-thunk.S files
+
+$(SYMTAB): build
+	@$(CONTENT_DIR)/mksymtab.sh $(CONTENT_DIR) >$@
+
+# Clean each subdirectory
+
+clean: $(foreach DIR, $(SUBDIRS), $(DIR)_clean)
+	@rm -f $(ROMFS_HDR) $(ROMFS_IMG) $(SYMTAB)
+	@rm -rf $(ROMFS_DIR)
+	@rm *~ .*.swp
+
+
diff --git a/examples/thttpd/content/hello.c b/examples/thttpd/content/hello.c
new file mode 100644
index 0000000000..9028d8fb90
--- /dev/null
+++ b/examples/thttpd/content/hello.c
@@ -0,0 +1,69 @@
+/****************************************************************************
+ * examples/thttpd/content/hello.c
+ * Manatory "Hello, World!" Example
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  fprintf(stderr, "Hello requested from: %s\n", getenv("REMOTE_ADDR"));
+
+  (void)printf(
+	"Content-type: text/html\r\n"
+	"Status: 200/html\r\n"
+	"\r\n"
+	"<HTML>"
+          "<HEAD>"
+             "<TITLE>Hello</TITLE>"
+          "</HEAD>\r\n"
+	"<BODY>"
+	    "<H2>Hello, World!</H2>"
+            "<P>Requested by: %s</P>"
+	"</BODY></HTML>\r\n",
+         getenv("REMOTE_ADDR"));
+  return 0;
+}
diff --git a/examples/thttpd/content/hello/Makefile b/examples/thttpd/content/hello/Makefile
new file mode 100644
index 0000000000..8a676627af
--- /dev/null
+++ b/examples/thttpd/content/hello/Makefile
@@ -0,0 +1,78 @@
+############################################################################
+# examples/thttpd/content/hello/Makefile
+#
+#   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+#   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+#
+# 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.
+# 3. Neither the name NuttX nor the names of its contributors may be
+#    used to endorse or promote products derived from this software
+#    without specific prior written permission.
+#
+# 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 OWNER 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.
+#
+############################################################################
+
+-include $(TOPDIR)/.config	# Current configuration
+-include $(TOPDIR)/Make.defs	# Basic make info
+
+BIN			= hello
+
+R1SRCS			= $(BIN).c
+R1OBJS			= $(R1SRCS:.c=.o)
+
+R2SRC			= $(BIN)-thunk.S
+R2OBJ			= $(R2SRC:.S=.o)
+
+all: $(BIN)
+
+$(R1OBJS): %.o: %.c
+	@echo "CC: $<"
+	@$(CC) -c $(CPICFLAGS) $< -o $@
+
+$(R2OBJ): %.o: %.S
+	@echo "AS: $<"
+	@$(CC) -c $(CPICFLAGS) $< -o $@
+
+$(BIN).r1: $(R1OBJS)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS1) -o $@ $^
+
+$(R2SRC): $(BIN).r1
+	@echo "MK: $<"
+	@$(MKNXFLAT) -o $@ $^
+
+$(BIN).r2: $(R2OBJ)
+	@echo "LD: $<"
+	@$(LD) $(NXFLATLDFLAGS2) -o $@ $(R1OBJS) $(R2OBJ)
+
+$(BIN): $(BIN).r2
+	@echo "LD: $<"
+	@$(LDNXFLAT) $(LDNXFLATFLAGS) -o $@ $^
+
+clean: 
+	@rm -f $(BIN) $(R2SRC) *.o *.r1 *.r2 *~ .*.swp core
+
+install:
+	@install -D $(BIN) $(ROMFS_DIR)/$(BIN)
+
diff --git a/examples/thttpd/content/hello/hello.c b/examples/thttpd/content/hello/hello.c
new file mode 100644
index 0000000000..bb76af9b67
--- /dev/null
+++ b/examples/thttpd/content/hello/hello.c
@@ -0,0 +1,68 @@
+/****************************************************************************
+ * examples/thttpd/content/hello.c
+ * Manatory "Hello, World!" Example
+ *
+ *   Copyright (C) 2009 Gregory Nutt. All rights reserved.
+ *   Author: Gregory Nutt <spudmonkey@racsa.co.cr>
+ *
+ * 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.
+ * 3. Neither the name Gregory Nutt nor the names of its contributors may be
+ *    used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * 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 OWNER 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.
+ *
+ ****************************************************************************/
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+#include <nuttx/config.h>
+#include <sys/types.h>
+
+#include <stdio.h>
+
+/****************************************************************************
+ * Public Functions
+ ****************************************************************************/
+
+int main(int argc, char *argv[])
+{
+  fprintf(stderr, "Hello requested from: %s\n", getenv("REMOTE_ADDR"));
+
+  (void)printf(
+	"Content-type: text/html\r\n"
+	"Status: 200/html\r\n"
+	"\r\n"
+	"<HTML>"
+          "<HEAD>"
+             "<TITLE>Hello</TITLE>"
+          "</HEAD>\r\n"
+	"<BODY>"
+	    "<H2>Hello, World!</H2>"
+            "<P>Requested by: %s</P>"
+	"</BODY></HTML>\r\n",
+         getenv("REMOTE_ADDR"));
+  return 0;
+}
diff --git a/examples/thttpd/content/mksymtab.sh b/examples/thttpd/content/mksymtab.sh
new file mode 100755
index 0000000000..611d3a87a0
--- /dev/null
+++ b/examples/thttpd/content/mksymtab.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+usage="Usage: %0 <test-dir-path>"
+
+dir=$1
+if [ -z "$dir" ]; then
+	echo "ERROR: Missing <test-dir-path>"
+	echo ""
+	echo $usage
+	exit 1
+fi
+
+if [ ! -d "$dir" ]; then
+	echo "ERROR: Directory $dir does not exist"
+	echo ""
+	echo $usage
+	exit 1
+fi
+
+varlist=`find $dir -name "*-thunk.S"| xargs grep -h asciz | cut -f3 | sort | uniq`
+
+echo "#ifndef __EXAMPLES_NXFLAT_TESTS_SYMTAB_H"
+echo "#define __EXAMPLES_NXFLAT_TESTS_SYMTAB_H"
+echo ""
+echo "#include <nuttx/symtab.h>"
+echo ""
+echo "static const struct symtab_s exports[] = "
+echo "{"
+
+for string in $varlist; do
+	var=`echo $string | sed -e "s/\"//g"`
+	echo "  {$string, $var},"
+done
+
+echo "};"
+echo "#define NEXPORTS (sizeof(exports)/sizeof(struct symtab_s))"
+echo ""
+echo "#endif /* __EXAMPLES_NXFLAT_TESTS_SYMTAB_H */"
+
diff --git a/examples/thttpd/main.c b/examples/thttpd/main.c
index 1d3d847d23..2e77b39d7b 100644
--- a/examples/thttpd/main.c
+++ b/examples/thttpd/main.c
@@ -38,11 +38,14 @@
  ****************************************************************************/
 
 #include <nuttx/config.h>
+#include <sys/types.h>
 #include <sys/ioctl.h>
+#include <sys/mount.h>
+
 #include <stdio.h>
-#include <string.h>
+#include <stdlib.h>
 #include <unistd.h>
-#include <time.h>
+#include <errno.h>
 #include <debug.h>
 
 #include <net/if.h>
@@ -50,10 +53,48 @@
 #include <net/uip/uip-arp.h>
 #include <net/uip/uip-lib.h>
 
+#include <nuttx/ramdisk.h>
+#include <nuttx/binfmt.h>
+#include <nuttx/nxflat.h>
+
+#include "content/romfs.h"
+#include "content/symtab.h"
+
 /****************************************************************************
  * Definitions
  ****************************************************************************/
 
+/* Check configuration.  This is not all of the configuration settings that
+ * are required -- only the more obvious.
+ */
+
+#if CONFIG_NFILE_DESCRIPTORS < 1
+#  error "You must provide file descriptors via CONFIG_NFILE_DESCRIPTORS in your configuration file"
+#endif
+
+#ifndef CONFIG_NXFLAT
+#  error "You must select CONFIG_NXFLAT in your configuration file"
+#endif
+
+#ifndef CONFIG_FS_ROMFS
+#  error "You must select CONFIG_FS_ROMFS in your configuration file"
+#endif
+
+#ifdef CONFIG_DISABLE_MOUNTPOINT
+#  error "You must not disable mountpoints via CONFIG_DISABLE_MOUNTPOINT in your configuration file"
+#endif
+
+#ifdef CONFIG_BINFMT_DISABLE
+#  error "You must not disable loadable modules via CONFIG_BINFMT_DISABLE in your configuration file"
+#endif
+
+/* Describe the ROMFS file system */
+
+#define SECTORSIZE   512
+#define NSECTORS(b)  (((b)+SECTORSIZE-1)/SECTORSIZE)
+#define ROMFSDEV     "/dev/ram0"
+#define MOUNTPT      "/mnt/www"
+
 #ifdef CONFIG_CPP_HAVE_VARARGS
 #  ifdef CONFIG_DEBUG
 #    define message(...) lib_lowprintf(__VA_ARGS__)
@@ -85,7 +126,6 @@
  * g_nsymbols:  The number of symbols in g_thttpdsymtab[].
  */
 
-#warning "Not yet initialized"
 FAR const struct symtab_s *g_thttpdsymtab;
 int                         g_thttpdnsymbols;
 
@@ -117,10 +157,13 @@ int user_start(int argc, char *argv[])
   uint8 mac[IFHWADDRLEN];
 #endif
   char *thttpd_argv = "thttpd";
+  int ret;
 
 /* Many embedded network interfaces must have a software assigned MAC */
 
 #ifdef CONFIG_EXAMPLE_UIP_NOMAC
+  message("Assigning MAC\n");
+
   mac[0] = 0x00;
   mac[1] = 0xe0;
   mac[2] = 0xb0;
@@ -132,6 +175,7 @@ int user_start(int argc, char *argv[])
 
   /* Set up our host address */
 
+  message("Setup network addresses\n");
   addr.s_addr = HTONL(CONFIG_THTTPD_IPADDR);
   uip_sethostaddr("eth0", &addr);
 
@@ -145,6 +189,44 @@ int user_start(int argc, char *argv[])
   addr.s_addr = HTONL(CONFIG_EXAMPLE_THTTPD_NETMASK);
   uip_setnetmask("eth0", &addr);
 
+  /* Initialize the NXFLAT binary loader */
+
+  message("Initializing the NXFLAT binary loader\n");
+  ret = nxflat_initialize();
+  if (ret < 0)
+    {
+      message("ERROR: Initialization of the NXFLAT loader failed: %d\n", ret);
+      exit(1);
+    }
+
+  /* Create a ROM disk for the ROMFS filesystem */
+
+  message("Registering romdisk\n");
+  ret = romdisk_register(0, (ubyte*)romfs_img, NSECTORS(romfs_img_len), SECTORSIZE);
+  if (ret < 0)
+    {
+      message("ERROR: romdisk_register failed: %d\n", ret);
+      nxflat_uninitialize();
+      exit(1);
+    }
+
+  /* Mount the file system */
+
+  message("Mounting ROMFS filesystem at target=%s with source=%s\n",
+         MOUNTPT, ROMFSDEV);
+
+  ret = mount(ROMFSDEV, MOUNTPT, "romfs", MS_RDONLY, NULL);
+  if (ret < 0)
+    {
+      message("ERROR: mount(%s,%s,romfs) failed: %s\n",
+              ROMFSDEV, MOUNTPT, errno);
+      nxflat_uninitialize();
+    }
+
+  /* Start THTTPD.  At present, symbol table info is passed via global variables */
+
+  g_thttpdsymtab   = exports;
+  g_thttpdnsymbols = NEXPORTS;
 
   printf("Starting THTTPD\n");
   thttpd_main(1, &thttpd_argv);