diff --git a/crypto777/tools/common.mk b/crypto777/tools/common.mk
index 922b289b0..114a49256 100644
--- a/crypto777/tools/common.mk
+++ b/crypto777/tools/common.mk
@@ -1,4 +1,4 @@
-# Copyrigh t (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -203,7 +203,7 @@ endif
 #
 # Compute path to requested NaCl Toolchain
 #
-TC_PATH := $(abspath $(NACL_SDK_ROOT)/../toolchain)
+TC_PATH := $(abspath $(NACL_SDK_ROOT)/toolchain)
 
 
 #
@@ -260,8 +260,6 @@ clean:
 	$(RM) -f $(TARGET).nmf
 	$(RM) -rf $(OUTDIR)
 	$(RM) -rf user-data-dir
-	mkdir pnacl; mkdir pnacl/Release
-	cp Release/* nacl_io.stamp pnacl/Release; 
 
 
 #
@@ -294,7 +292,6 @@ ifeq (,$(2))
 else
 	+$(MAKE) -C $(2) STAMPDIR=$(abspath $(STAMPDIR)) $(abspath $(STAMPDIR)/$(1).stamp) $(3)
 endif
-	cp pnacl/Release/*.pexe pnacl/Release/*.bc pnacl/Release/SuperNET_API.nmf Release
 
 all: rebuild_$(1)
 $(STAMPDIR)/$(1).stamp: rebuild_$(1)
@@ -443,8 +440,7 @@ endif
 # Variables for running examples with Chrome.
 #
 RUN_PY := python $(NACL_SDK_ROOT)/tools/run.py
-#HTTPD_PY := python $(NACL_SDK_ROOT)/tools/httpd.py
-HTTPD_PY := python tools/httpd.py
+HTTPD_PY := python $(NACL_SDK_ROOT)/tools/httpd.py
 
 # Add this to launch Chrome with additional environment variables defined.
 # Each element should be specified as KEY=VALUE, with whitespace separating
@@ -532,7 +528,7 @@ debug: check_for_chrome all $(PAGE)
 
 .PHONY: serve
 serve: all
-	echo run tools/httpd.py
+	$(HTTPD_PY) -C $(CURDIR)
 endif
 
 # uppercase aliases (for backward compatibility)
diff --git a/iguana/pnacl/Release/iguana.nmf b/iguana/pnacl/Release/iguana.nmf
new file mode 100644
index 000000000..9d37ed227
--- /dev/null
+++ b/iguana/pnacl/Release/iguana.nmf
@@ -0,0 +1,12 @@
+{
+  "program": {
+    "portable": {
+      "pnacl-translate": {
+        "url": "iguana.pexe"
+      },
+      "pnacl-debug": {
+        "url": "iguana_unstripped.bc"
+      }
+    }
+  }
+}
diff --git a/iguana/pnacl/Release/iguana.pexe b/iguana/pnacl/Release/iguana.pexe
new file mode 100644
index 000000000..fdf8adff3
Binary files /dev/null and b/iguana/pnacl/Release/iguana.pexe differ
diff --git a/iguana/tools/common.mk b/iguana/tools/common.mk
index 922b289b0..114a49256 100644
--- a/iguana/tools/common.mk
+++ b/iguana/tools/common.mk
@@ -1,4 +1,4 @@
-# Copyrigh t (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -203,7 +203,7 @@ endif
 #
 # Compute path to requested NaCl Toolchain
 #
-TC_PATH := $(abspath $(NACL_SDK_ROOT)/../toolchain)
+TC_PATH := $(abspath $(NACL_SDK_ROOT)/toolchain)
 
 
 #
@@ -260,8 +260,6 @@ clean:
 	$(RM) -f $(TARGET).nmf
 	$(RM) -rf $(OUTDIR)
 	$(RM) -rf user-data-dir
-	mkdir pnacl; mkdir pnacl/Release
-	cp Release/* nacl_io.stamp pnacl/Release; 
 
 
 #
@@ -294,7 +292,6 @@ ifeq (,$(2))
 else
 	+$(MAKE) -C $(2) STAMPDIR=$(abspath $(STAMPDIR)) $(abspath $(STAMPDIR)/$(1).stamp) $(3)
 endif
-	cp pnacl/Release/*.pexe pnacl/Release/*.bc pnacl/Release/SuperNET_API.nmf Release
 
 all: rebuild_$(1)
 $(STAMPDIR)/$(1).stamp: rebuild_$(1)
@@ -443,8 +440,7 @@ endif
 # Variables for running examples with Chrome.
 #
 RUN_PY := python $(NACL_SDK_ROOT)/tools/run.py
-#HTTPD_PY := python $(NACL_SDK_ROOT)/tools/httpd.py
-HTTPD_PY := python tools/httpd.py
+HTTPD_PY := python $(NACL_SDK_ROOT)/tools/httpd.py
 
 # Add this to launch Chrome with additional environment variables defined.
 # Each element should be specified as KEY=VALUE, with whitespace separating
@@ -532,7 +528,7 @@ debug: check_for_chrome all $(PAGE)
 
 .PHONY: serve
 serve: all
-	echo run tools/httpd.py
+	$(HTTPD_PY) -C $(CURDIR)
 endif
 
 # uppercase aliases (for backward compatibility)