  	if ( CPU_haveCPUID() ) {
 diff --git a/src/main/nacl/pepper_instance.c b/src/main/nacl/pepper_instance.c
 new file mode 100644
-index 0000000..997e13a
+index 0000000..6e1f036
 --- /dev/null
 +++ b/src/main/nacl/pepper_instance.c
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,338 @@
 +/*
 + * Copyright (c) 2011 The Native Client Authors. All rights reserved.
 + * Use of this source code is governed by a BSD-style license that can be

 #endif
diff --git a/src/audio/nacl/SDL_naclaudio.cc b/src/audio/nacl/SDL_naclaudio.cc
new file mode 100644
index 0000000..908a498
--- /dev/null
+++ b/src/audio/nacl/SDL_naclaudio.cc
@@ -0,0 +1,150 @@
+#include "SDL_config.h"
+#include "SDL_naclaudio.h"
+

+  if (mount_default) {
+    // Create an http mount by default
+    fprintf(stderr, "SDL: creating default http mount\n");
+    rtn = chdir("/home");
+    if (rtn != 0)
+      fprintf(stderr, "SDL: chdir failed: %s\n", strerror(errno));
+    rtn = mount(".", "/home", "httpfs", 0, "");
+    if (rtn != 0)
+      fprintf(stderr, "SDL: mount failed: %s\n", strerror(errno));
+  }
+
+  for (i = 0; i < g_argc; i++) {
+    nacl_io_log("SDL: arg=%s\n", g_argn[i]);
+    if (!stricmp(g_argn[i], "PWD")) {
+      int rtn = chdir(g_argv[i]);
+      if (rtn != 0)
+        nacl_io_log("SDL: chdir(%s) failed\n", g_argv[i]);
+      else
+        nacl_io_log("SDL: chdir(%s)\n", g_argv[i]);
+    } else if (!strcmp(g_argn[i], "sdl_tar_extract")) {
+      const char* source;
+      const char* target = "/";
+      char* sep;
