diff --git a/common/Makefile b/common/Makefile
index 5f18cbe2..d8400a50 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -6,7 +6,7 @@ BUILD_DATE    = $(shell date "+%Y/%m/%d %H:%M:%S")
 BASE          = $(TOP)/../common
 GOOGLE_PROJ   = dactyl
 GOOGLE	      = https://$(GOOGLE_PROJ).googlecode.com/files
-VERSION	      = $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
+VERSION	     ?= $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
 UUID   	      = $(shell sed -n 's/.*em:id\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
 
 LOCALEDIR     = locale
@@ -108,14 +108,15 @@ install:
 	for dir in $(PROFILEPATHS); do \
 		test -f "$$dir/profiles.ini" && break; \
 	done; \
-	profile=$${PROFILE:-$$(sed 's/^$$/\#/' "$$dir/profiles.ini" |\
+	profile=$$(sed 's/^$$/\#/' "$$dir/profiles.ini" |\
 		awk -v"profile=$(PROFILE)" \
-			'BEGIN { RS="#" } index("\n" profile "\n", $$0) || !profile && /\nDefault=1/' |\
+			'BEGIN { RS="#" } \
+			index($$0, "\nName=" profile "\n") || !profile && /\nDefault=1/' |\
 		awk -F= '{ args[$$1] = $$2 } \
 		END {\
 			if (args["IsRelative"]) print ENVIRON["dir"] "/" args["Path"];\
 			else print args["Path"]\
-		}')}; \
+		}'); \
 	if ! test -d "$$profile"; then \
 		echo >&2 "Can't locate profile directory"; \
 		exit 1; \
diff --git a/common/content/options.js b/common/content/options.js
index c462e26c..3b7d73b0 100644
--- a/common/content/options.js
+++ b/common/content/options.js
@@ -1405,7 +1405,7 @@ const Options = Module("options", {
         completion.optionValue = function (context, name, op, curValue, completer) {
             let opt = options.get(name);
             completer = completer || opt.completer;
-            if (!completer)
+            if (!completer || !opt)
                 return;
 
             try {
diff --git a/pentadactyl/NEWS b/pentadactyl/NEWS
index 8a10e94c..2569c178 100644
--- a/pentadactyl/NEWS
+++ b/pentadactyl/NEWS
@@ -1,4 +1,4 @@
-1.0b1:
+1.0b2:
     * Extensive Firefox 4 support, including:
       - Tabs in :buffer completions and listings are grouped
         by panorama groups.
@@ -18,7 +18,6 @@
       - Backtracks to the first successful match after pressing
         backspace.
       - Supports reverse incremental search.
-    * Command script files now use the *.penta file extension.
     * Multiple Ex commands may now be separated by |
     * Command-line is now hidden by default. Added C and M to
       'guioptions'.
@@ -29,7 +28,8 @@
         global object, including XMLHttpRequest and encodeURI.
     * The concept of completion contexts is now exposed to the user
       (see :h :contexts), allowing for powerful and fine-grained
-      completion system customisation.
+      completion system customization.
+    * IMPORTANT: Command script files now use the *.penta file extension.
     * IMPORTANT: Plugins are now loaded from the 'plugins/'
       directory in 'runtimepath' rather than 'plugin/'.
     * IMPORTANT: 'loadplugins' is now a regexlist option rather than
@@ -53,15 +53,15 @@
       groups should be auto-completed.
     * Added 'banghist' option.
     * Added BookmarkChange, BookmarkRemove autocommands.
-    * Added -keyword, -tags, -title to :delbmarks
+    * Added -keyword, -tags, -title to :delbmarks.
     * Added 'hintkeys' option.
     * Replaced 'focuscontent' with 'strictfocus'.
     * Added 'wildanchor' option.
     * Added "transliterated" option to 'hintmatching'.
     * Added -javascript option to :abbrev and :map.
     * Added several new options to :map.
-    * Added -agent flag to :style
-    * Added "passwords" and "venkman" dialogs to :dialog
+    * Added -agent flag to :style.
+    * Added "passwords" and "venkman" dialogs to :dialog.
     * Removed the :source line at the end of files generated by
       :mkpentadactylrc.
     * gf now toggles between source and content view.
@@ -81,7 +81,7 @@
       - Add basic plugin authorship documentation.
       - The help system is newly modularized and features significant
         updates, rewrites, and formatting improvements.
-    * Removed :beep
+    * Removed :beep.
     * Removed :edit, :tabedit, and :winedit aliases.
     * Removed :play.
 
diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf
index 44e0b457..6d006e0e 100644
--- a/pentadactyl/install.rdf
+++ b/pentadactyl/install.rdf
@@ -4,10 +4,10 @@
     <Description about="urn:mozilla:install-manifest"
         em:id="pentadactyl@dactyl.googlecode.com"
         em:name="Pentadactyl"
-        em:version="1.0b2pre"
+        em:version="1.0b2"
         em:description="Firefox for Vim and Links addicts"
         em:creator="Kris Maglione"
-        em:homepageURL="http://dactyl.sf.net/Pentadactyl"
+        em:homepageURL="http://dactyl.sourceforge.net/pentadactyl"
         em:iconURL="chrome://pentadactyl/skin/icon.png"
         em:optionsURL="chrome://dactyl/content/preferences.xul">
         <em:targetApplication>