diff --git a/Makefile.am b/Makefile.am
index b6c78e281..673737e8f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # This is the top level Makefile for Gramps
 # $Id$
 
-SUBDIRS = m4 po src data example help
+SUBDIRS = m4 po src data example #help
 
 EXTRA_DIST = \
 	config.rpath autogen.sh gramps.spec.in gramps.spec \
diff --git a/configure.in b/configure.in
index 74ca8136c..e49c4ad0f 100644
--- a/configure.in
+++ b/configure.in
@@ -11,8 +11,8 @@ AM_INIT_AUTOMAKE(1.6.3)
 AC_CONFIG_MACRO_DIR([m4])
 GNOME_DOC_INIT
 
-RELEASE=0.SVN$(svnversion -n .)
-dnl RELEASE=1
+dnl RELEASE=0.SVN$(svnversion -n .)
+RELEASE=1
 
 VERSIONSTRING=$VERSION
 if test x"$RELEASE" != "x"
@@ -189,7 +189,6 @@ m4/Makefile
 Makefile
 gramps.spec
 gramps.sh
-help/Makefile
 src/const.py
 src/Makefile
 src/RelLib/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1900c0c08..5cce8626b 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -203,7 +203,7 @@ src/plugins/IndivComplete.py
 src/plugins/IndivSummary.py
 src/plugins/Leak.py
 src/plugins/Merge.py
-src/plugins/NavWebPage.py
+src/plugins/NarrativeWeb.py
 src/plugins/PatchNames.py
 src/plugins/ReadPkg.py
 src/plugins/Rebuild.py
diff --git a/src/QuestionDialog.py b/src/QuestionDialog.py
index 121b6193a..44e753d3e 100644
--- a/src/QuestionDialog.py
+++ b/src/QuestionDialog.py
@@ -182,7 +182,7 @@ class WarningDialog(gtk.MessageDialog):
                                    type=gtk.MESSAGE_WARNING,
                                    buttons=gtk.BUTTONS_CLOSE)
         self.set_markup('<span weight="bold" size="larger">%s</span>' % msg1)
-        self.format_secondary_text(msg2)
+        self.format_secondary_markup(msg2)
         self.set_icon(ICON)
         self.show()
         self.run()
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 59d658083..d07c2f208 100644
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -156,8 +156,6 @@ class Gramps:
         
         state = GrampsDb.DbState()
         self.vm = ViewManager.ViewManager(state)
-#        self.vm.register_view(DataViews._PersonView.PersonView)
-#        self.vm.register_view(DataViews._FamilyList.FamilyListView)
         for view in DataViews.get_views():
             self.vm.register_view(view)
 
@@ -197,6 +195,24 @@ class Gramps:
 ##         self.db.connect('person-update',self.on_update_bookmark)
 
     def welcome(self):
+        if not Config.get(Config.BETAWARN):
+            from QuestionDialog import WarningDialog
+            WarningDialog(
+                _('Danger: This is unstable code!'),
+                _("The GRAMPS 2.1 release is an early, experimental "
+                  "branch of the future 2.2 release. This version is "
+                  "not meant for normal usage. Use at your own risk.\n\n"
+                  "This version may:\n1) Fail to run properly\n"
+                  "2) Corrupt your data\n3) Cause your hair to turn "
+                  "pink and fall out.\n\nAny databases opened by this "
+                  "version will <b>NO LONGER WORK</b> in older versions of "
+                  "GRAMPS, and <b>MAY NOT WORK</b> in with future "
+                  "releases of GRAMPS. <b>BACKUP</b> your existing databases "
+                  "before opening them with this version, and make "
+                  "sure to export your data to XML every now and then."))
+            Config.set(Config.AUTOLOAD,False)
+            Config.set(Config.BETAWARN,True)
+                            
         return
 
     def researcher_key_update(self,client,cnxn_id,entry,data):
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index cf07f5b0a..010de2395 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -35,7 +35,7 @@ pkgdata_PYTHON = \
 	IndivSummary.py\
 	ImportvCard.py\
 	Merge.py\
-	NavWebPage.py\
+	NarrativeWeb.py\
 	PatchNames.py\
 	ReadPkg.py\
 	Rebuild.py\
diff --git a/src/plugins/NavWebPage.py b/src/plugins/NarrativeWeb.py
similarity index 100%
rename from src/plugins/NavWebPage.py
rename to src/plugins/NarrativeWeb.py