diff --git a/ChangeLog b/ChangeLog
index 93458054b..5ac808307 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-06  Brian Matherly <brian@gramps-project.org>
+	* src/Config/_GrampsConfigKeys.py:
+	* src/DataViews/__init__.py:
+	* src/DataViews/GoogleView.py:
+	Don't enable GoogleView and pass on gtkmozembed failure for systems that
+	don't have Gnome.
+
 2008-01-06 Jerome Rapinat <romjerome@yahoo.fr>
         * src/docgen/Makefile.am: gtkprintpreview.glade was not pasted on install 
 
diff --git a/src/Config/_GrampsConfigKeys.py b/src/Config/_GrampsConfigKeys.py
index df199ca44..0f90c7b29 100644
--- a/src/Config/_GrampsConfigKeys.py
+++ b/src/Config/_GrampsConfigKeys.py
@@ -284,7 +284,7 @@ default_value = {
     GENERATION_DEPTH     : 15,
     DATA_VIEWS: ('MyGrampsView,PersonView,RelationshipView,FamilyListView,'
                  'PedigreeView,EventView,SourceView,PlaceView,MediaView,'
-                 'RepositoryView,NoteView,GoogleView'),
+                 'RepositoryView,NoteView'),
     ADDMEDIA_IMGDIR      : '',
     ADDMEDIA_RELPATH     : False,
 }
diff --git a/src/DataViews/GoogleView.py b/src/DataViews/GoogleView.py
index c184bf336..37d11981b 100644
--- a/src/DataViews/GoogleView.py
+++ b/src/DataViews/GoogleView.py
@@ -63,7 +63,10 @@ import Errors
 #import cPickle as pickle
 #import Config
 #from QuestionDialog import RunDatabaseRepair, ErrorDialog
-import gtkmozembed
+try:
+    import gtkmozembed
+except:
+    pass
 import urlparse
 
 
diff --git a/src/DataViews/__init__.py b/src/DataViews/__init__.py
index b7b10d147..f4aa0f102 100644
--- a/src/DataViews/__init__.py
+++ b/src/DataViews/__init__.py
@@ -58,7 +58,7 @@ except:
         #MapView,
         RepositoryView,
         NoteView,
-        GoogleView,
+        #GoogleView,
         ]
 
 def get_views():