diff --git a/app/Editor.java b/app/Editor.java
index 0886223dc..1d30aadd4 100644
--- a/app/Editor.java
+++ b/app/Editor.java
@@ -863,16 +863,6 @@ public class Editor extends JFrame
     JMenu menu = new JMenu("Help");
     JMenuItem item;
 
-//    item = new JMenuItem("Environment");
-//    item.addActionListener(new ActionListener() {
-//        public void actionPerformed(ActionEvent e) {
-//          Base.openURL(System.getProperty("user.dir") + File.separator +
-//                          "reference" + File.separator + "environment" +
-//                          File.separator + "index.html");
-//        }
-//      });
-//    menu.add(item);
-
     item = new JMenuItem("Howto");
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
@@ -882,6 +872,24 @@ public class Editor extends JFrame
       });
     menu.add(item);
 
+    item = new JMenuItem("Environment");
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          Base.openURL(System.getProperty("user.dir") + File.separator +
+                          "reference" + File.separator + "environment.html");
+        }
+      });
+    menu.add(item);
+
+    item = new JMenuItem("Frequenty Asked Questions");
+    item.addActionListener(new ActionListener() {
+        public void actionPerformed(ActionEvent e) {
+          Base.openURL(System.getProperty("user.dir") + File.separator +
+                          "reference" + File.separator + "FAQ.html");
+        }
+      });
+    menu.add(item);
+
     item = new JMenuItem("Reference");
     item.addActionListener(new ActionListener() {
         public void actionPerformed(ActionEvent e) {
diff --git a/build/fetch.sh b/build/fetch.sh
index 7fe8696bc..5d635fa04 100755
--- a/build/fetch.sh
+++ b/build/fetch.sh
@@ -9,11 +9,14 @@ mkdir reference
 cd reference
 curl http://www.arduino.cc/en/Main/Howto -o howto.html
 curl http://www.arduino.cc/en/Main/FAQ -o FAQ.html
+curl http://arduino.cc/en/Main/Environment -o environment.html
 curl http://www.arduino.cc/en/Reference/HomePage -o index.html
 curl http://www.arduino.cc/en/pub/skins/arduino/arduino.css -o arduino.css
 for i in `grep -o "http://www.arduino.cc/en/Reference/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Reference/$i -o $i.html; done
-perl -i -pe "s|http://www.arduino.cc/en/Reference/[^?\"']*\?[^'\"]*|#|g" *.html
-perl -i -pe "s|http://www.arduino.cc/en/Reference/([^']*)|\1.html|g" *.html
+for i in `grep -o "http://www.arduino.cc/en/Serial/[^']*" index.html | sort -u | grep -v '?' | cut -d '/' -f 6`; do curl http://www.arduino.cc/en/Serial/$i -o Serial_$i.html; done
+perl -i -pe "s|http://www.arduino.cc/en/Reference/[^?\"']*\?[^'\"]*|#|g" *.html # replace links to unknown pages with links to '#'
+perl -i -pe "s|http://www.arduino.cc/en/Reference/([^']*)|\1.html|g" *.html # replace links to remote reference with links to local reference
+perl -i -pe "s|http://www.arduino.cc/en/Serial/([^']*)|Serial_\1.html|g" *.html # replace links to remove serial reference with links to local serial reference
 perl -i -pe "s|http://www.arduino.cc/en/pub/skins/arduino/arduino.css|arduino.css|g" *.html
 perl -i -pe "s|HomePage.html|index.html|g" *.html
 perl -i -pe "s|href=\"/\"|href=\"http://www.arduino.cc/\"|g" *.html
diff --git a/build/macosx/Arduino.xcodeproj/project.pbxproj b/build/macosx/Arduino.xcodeproj/project.pbxproj
index 8346df93b..b5a2c1045 100644
--- a/build/macosx/Arduino.xcodeproj/project.pbxproj
+++ b/build/macosx/Arduino.xcodeproj/project.pbxproj
@@ -369,6 +369,7 @@
 		330B21530968180400345666 /* librxtxSerial.jnilib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.bundle"; path = librxtxSerial.jnilib; sourceTree = "<group>"; };
 		332D4DB509CF147F00BF81F6 /* Sizer.java */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.java; path = Sizer.java; sourceTree = "<group>"; };
 		333269E1099BB1FC007D3AE2 /* tools.zip */ = {isa = PBXFileReference; lastKnownFileType = archive.zip; path = tools.zip; sourceTree = "<group>"; };
+		337CD3F309EFC183002B890C /* fetch.sh */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.sh; path = fetch.sh; sourceTree = "<group>"; };
 		33AF620A0965D67800B514A9 /* antlr.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = antlr.jar; sourceTree = "<group>"; };
 		33AF620B0965D67900B514A9 /* applet.html */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.html; path = applet.html; sourceTree = "<group>"; };
 		33AF620C0965D67900B514A9 /* mrj.jar */ = {isa = PBXFileReference; lastKnownFileType = archive.jar; path = mrj.jar; sourceTree = "<group>"; };
@@ -878,6 +879,7 @@
 		33FFFE800965BD110016AC38 /* build */ = {
 			isa = PBXGroup;
 			children = (
+				337CD3F309EFC183002B890C /* fetch.sh */,
 				33FFFE810965BD110016AC38 /* howto.txt */,
 				33FFFE820965BD110016AC38 /* linux */,
 				33FFFE920965BD110016AC38 /* macosx */,
diff --git a/build/shared/reference.zip b/build/shared/reference.zip
index 86a8c26e8..976cb0e5b 100644
Binary files a/build/shared/reference.zip and b/build/shared/reference.zip differ