diff --git a/ChangeLog b/ChangeLog
index a4096aca5..864e0ee3a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-01-16 Erik De Richter <frederik.de.richter@pandora.be>
+    * data/man/nl: added 
+    * data/man/nl/gramps.1.in: added
+    * data/man/nl/Makefile.am: added
+    * configure.in: changed to add above nl directory
+    * data/man/Makfile.am: changed to add above nl man page
+
 2008-01-16 Jerome Rapinat <romjerome@yahoo.fr>
         * src/images/Makefile.am: add missing reference for gramps-import.png
 
@@ -32,6 +39,7 @@
     * man/sv/Makefile.am: Added Swedish man page (sv).
     * man/fr/gramps.1.in: got the French man page back, which I overwrote yesterday
 
+>>>>>>> .r9846
 2008-01-15  Raphael Ackermann <raphael.ackermann@gmail.com>
 	* src/docgen/Makefile.am: added line to copy gtkprintpreview.glade
 	on distcheck.
diff --git a/data/man/Makefile.am b/data/man/Makefile.am
index b8dda81c4..8cb2e1810 100644
--- a/data/man/Makefile.am
+++ b/data/man/Makefile.am
@@ -1,7 +1,7 @@
 # This is the data/man level Makefile for Gramps
 # $Id$
 
-SUBDIRS = fr sv
+SUBDIRS = fr sv nl
 
 man_IN_FILES = gramps.1.in
 man_MANS = $(man_IN_FILES:.1.in=.1)