diff --git a/ChangeLog b/ChangeLog
index 5783c29337..acbd355e2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -42,6 +42,11 @@
           Try to fix transactions that have no currency, perhaps because
           of a log replay.  Workaround for bug #143720.
 
+	Boris Zbarsky's advanced-portfolio patch.
+	* src/report/standard-reports/advanced-portfolio.scm:
+	  Apply dividend and brokerage to moneyin and moneyout to more
+	  accurately reflect account activity.  Fixes bug #311549.
+
 2006-02-11  Derek Atkins  <derek@ihtfp.com>
 
 	* src/report/report-gnome/gnc-plugin-page-report.c:
diff --git a/src/report/standard-reports/advanced-portfolio.scm b/src/report/standard-reports/advanced-portfolio.scm
index c4e897c568..1478bd3c0e 100644
--- a/src/report/standard-reports/advanced-portfolio.scm
+++ b/src/report/standard-reports/advanced-portfolio.scm
@@ -226,6 +226,8 @@
 ;;               (gnc:debug "totalunits" totalunits)
 ;;               (gnc:debug "totalunityears" totalunityears)
 
+               (moneyincoll 'minusmerge dividendcoll #f)
+               (moneyoutcoll 'minusmerge brokeragecoll #f)
                (gaincoll 'merge moneyoutcoll #f)
                (gaincoll 'add (gnc:gnc-monetary-commodity value) (gnc:gnc-monetary-amount value))
                (gaincoll 'merge moneyincoll #f)