diff --git a/wombat/ChangeLog b/wombat/ChangeLog
index 6efdaf24e9..e05e509123 100644
--- a/wombat/ChangeLog
+++ b/wombat/ChangeLog
@@ -1,3 +1,8 @@
+2001-02-12  Kjartan Maraas  <kmaraas@gnome.org>
+
+	* Makefile.am: xml-i18n-tools setup.
+	* GNOME_Evolution_Wombat.oaf.in: Mark strings for translation.
+	
 2001-02-08  JP Rosevear  <jpr@ximian.com>
 
 	* Makefile.am: Remove useless ldflags
diff --git a/wombat/GNOME_Evolution_Wombat.oaf.in b/wombat/GNOME_Evolution_Wombat.oaf.in
index 8f74e35512..4c1b2875fd 100644
--- a/wombat/GNOME_Evolution_Wombat.oaf.in
+++ b/wombat/GNOME_Evolution_Wombat.oaf.in
@@ -10,7 +10,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="The Personal Addressbook Server"/>
+                       _value="The Personal Addressbook Server"/>
 </oaf_server>
 
 <oaf_server iid="OAFIID:GNOME_Evolution_Wombat_CalendarFactory"
@@ -23,7 +23,7 @@
 	</oaf_attribute>
 
 	<oaf_attribute name="description" type="string"
-                       value="The Personal Calendar Server; calendar factory"/>
+                       _value="The Personal Calendar Server; calendar factory"/>
 
 </oaf_server>
 
diff --git a/wombat/Makefile.am b/wombat/Makefile.am
index cb5b405808..c36a7d4741 100644
--- a/wombat/Makefile.am
+++ b/wombat/Makefile.am
@@ -34,9 +34,14 @@ wombat_LDADD =							\
 	$(LDAP_LIBS)
 
 oafdir = $(datadir)/oaf
-oaf_DATA = GNOME_Evolution_Wombat.oafinfo
 
-EXTRA_DIST = $(oaf_DATA)
+oaf_in_files = GNOME_Evolution_Wombat.oaf.in
+oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
+
+@XML_I18N_MERGE_OAF_RULE@
+
+
+EXTRA_DIST = $(oaf_DATA) $(oaf_in_files)
 
 if ENABLE_PURIFY
 PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@