diff --git a/ChangeLog b/ChangeLog
index cf3d08d70..72a360bfe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
 	* src/plugins/FtmStyleDescendants.py: New date handling.
 	* src/plugins/FtmStyleAncestors.py: New date handling.
 
+	* src/Report.py (Report.__init__): Proper use of output;
+	(report): Typo; (cl_report): Use begin_report and finish_report.
+	* src/plugins/BookReport.py (BookReportDialog.make_report):
+	Use begin_report for each item.
+
 2004-12-28  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/DateEdit.py: use global date displayer/parser
 	* src/DateHandler.py: provide global date displayer/parser 
diff --git a/src/Report.py b/src/Report.py
index a640b010c..f30e5f393 100644
--- a/src/Report.py
+++ b/src/Report.py
@@ -213,7 +213,7 @@ class Report:
 
         if options_class.get_output():
             self.standalone = True
-            self.doc.open(output)
+            self.doc.open(options_class.get_output())
             self.doc.init()
         else:
             self.standalone = False
@@ -1741,7 +1741,7 @@ def report(database,person,report_class,options_class,translated_name,name,categ
             MyReport = report_class(dialog.db,dialog.person,dialog.options)
             MyReport.begin_report()
             MyReport.write_report()
-            MyReport.end_report()
+            MyReport.finish_report()
         except Errors.FilterError, msg:
             (m1,m2) = msg.messages()
             ErrorDialog(m1,m2)
@@ -1785,7 +1785,9 @@ def cl_report(database,name,category,report_class,options_class,options_str_dict
         clr.option_class.handler.doc = clr.format(
                     clr.selected_style,clr.paper,clr.template_name,clr.orien)
         MyReport = report_class(database, clr.person, clr.option_class)
+        MyReport.begin_report()
         MyReport.write_report()
+        MyReport.finish_report()
     except:
         import DisplayTrace
         DisplayTrace.DisplayTrace()
diff --git a/src/plugins/BookReport.py b/src/plugins/BookReport.py
index 8ba81bda9..df1064cc6 100644
--- a/src/plugins/BookReport.py
+++ b/src/plugins/BookReport.py
@@ -1029,6 +1029,7 @@ class BookReportDialog(Report.ReportDialog):
 
         self.doc.init()
         for item in self.rptlist:
+            item.begin_report()
             item.write_report()
         self.doc.close()