diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index 6763ad78b..c1f412264 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-13  Alex Roitman  <shura@gramps-project.org>
+	* src/docgen/PdfDoc.py: Proper indentation for the first line with
+	and without bullets.
+
 2005-11-12  Don Allingham  <don@gramps-project.org>
 	* src/plugins/DetDescendantReport.py: add support for Henry
 	numbers for descendants
diff --git a/gramps2/src/docgen/PdfDoc.py b/gramps2/src/docgen/PdfDoc.py
index 16647ac9c..4bf574502 100644
--- a/gramps2/src/docgen/PdfDoc.py
+++ b/gramps2/src/docgen/PdfDoc.py
@@ -156,10 +156,10 @@ class PdfDoc(BaseDoc.BaseDoc):
 
             pdf_style.rightIndent = style.get_right_margin()*cm
             pdf_style.leftIndent = style.get_left_margin()*cm
-            pdf_style.firstLineIndent = style.get_left_margin()*cm + \
-                                        style.get_first_indent()*cm
-            pdf_style.bulletIndent = pdf_style.firstLineIndent
-
+            pdf_style.firstLineIndent = style.get_first_indent()*cm
+            pdf_style.bulletIndent = pdf_style.firstLineIndent + \
+                                     pdf_style.leftIndent
+            
             align = style.get_alignment()
             if align == BaseDoc.PARA_ALIGN_RIGHT:
                 pdf_style.alignment = TA_RIGHT
@@ -204,6 +204,7 @@ class PdfDoc(BaseDoc.BaseDoc):
         if leader==None:
             self.text = ''
         else:
+            self.current_para.firstLineIndent = 0
             self.text = '<bullet>%s</bullet>' % leader
 
     def end_paragraph(self):