diff --git a/Makefile.am b/Makefile.am
index cfd832de..1c65967e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 XSLTPROC = xsltproc --xinclude --nonet
 
-XMLS = $(wildcard introspection/mm-*.xml)
+XMLS = $(wildcard introspection/*.xml)
 
 if WITH_DOCS
 
@@ -54,6 +54,9 @@ include/mm-modem.h: $(XMLS) introspection/all.xml header-generator.xsl
 %service: %service.in
 	$(edit) $< >$@
 
+xmldir = $(datadir)/dbus-1/interfaces
+xml_DATA = $(XMLS)
+
 edit = @sed \
 	-e 's|@sbindir[@]|$(sbindir)|g' \
 	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
diff --git a/introspection/mm-modem-cdma.xml b/introspection/mm-modem-cdma.xml
index e224296f..bf91c0c9 100644
--- a/introspection/mm-modem-cdma.xml
+++ b/introspection/mm-modem-cdma.xml
@@ -57,10 +57,10 @@
       <tp:docstring>Get device registration state.</tp:docstring>
       <annotation name="org.freedesktop.DBus.GLib.Async" value=""/>
       <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="impl_modem_cdma_get_registration_state"/>
-      <arg name="cdma-1x-state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
+      <arg name="cdma_1x_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
         <tp:docstring>CDMA 1x registration state.</tp:docstring>
       </arg>
-      <arg name="evdo-state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
+      <arg name="evdo_state" type="u" direction="out" tp:type="MM_MODEM_CDMA_REGISTRATION_STATE">
         <tp:docstring>EVDO registration state.</tp:docstring>
       </arg>
     </method>