diff --git a/ChangeLog b/ChangeLog
index 040983b08..7e4baf2be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-31  Brian Matherly  <brian@gramps-project.org>
+	* src/BaseDoc.py:
+	* src/docgen/AbiWord2Doc.py:
+	* src/docgen/ODFDoc.py:
+	* src/OpenOfficeDoc.py:	
+	Remove "self.font" and "self.media_list" from the BaseDoc interface as they
+	are only common to a couple of formats.
+
 2007-03-31  Brian Matherly  <brian@gramps-project.org>
 	* src/docgen/AbiWord2Doc.py: Fix PaperStyle typos.
 
diff --git a/src/BaseDoc.py b/src/BaseDoc.py
index c7fbd731a..b8fc69f54 100644
--- a/src/BaseDoc.py
+++ b/src/BaseDoc.py
@@ -1243,12 +1243,10 @@ class BaseDoc:
         self.title = ""
                 
         self.draw_styles = {}
-        self.font = FontStyle()
         self.style_list = styles.get_styles()
         self.table_styles = {}
         self.cell_styles = {}
         self.name = ""
-        self.media_list = []
         self.print_req = 0
         self.init_called = False
 
diff --git a/src/docgen/AbiWord2Doc.py b/src/docgen/AbiWord2Doc.py
index c69793857..57987c0cd 100644
--- a/src/docgen/AbiWord2Doc.py
+++ b/src/docgen/AbiWord2Doc.py
@@ -58,6 +58,7 @@ class AbiWordDoc(BaseDoc.BaseDoc):
         """Initializes the AbiWordDoc class, calling the __init__ routine
         of the parent BaseDoc class"""
         BaseDoc.BaseDoc.__init__(self,styles,type,template)
+        self.media_list = []
         self.f = None
         self.level = 0
         self.new_page = 0
diff --git a/src/docgen/ODFDoc.py b/src/docgen/ODFDoc.py
index 93b410e25..fbc2b56d2 100644
--- a/src/docgen/ODFDoc.py
+++ b/src/docgen/ODFDoc.py
@@ -76,6 +76,7 @@ class ODFDoc(BaseDoc.BaseDoc):
 
     def __init__(self,styles,type,template):
         BaseDoc.BaseDoc.__init__(self,styles,type,template)
+        self.media_list = []
         self.cntnt = None
         self.filename = None
         self.level = 0
diff --git a/src/docgen/OpenOfficeDoc.py b/src/docgen/OpenOfficeDoc.py
index 2c3c6280b..dd865586a 100644
--- a/src/docgen/OpenOfficeDoc.py
+++ b/src/docgen/OpenOfficeDoc.py
@@ -72,6 +72,7 @@ class OpenOfficeDoc(BaseDoc.BaseDoc):
 
     def __init__(self,styles,type,template):
         BaseDoc.BaseDoc.__init__(self,styles,type,template)
+        self.media_list = []
         self.cntnt = None
         self.filename = None
         self.level = 0