--- bin/Makefile.am.orig	2014-03-07 09:32:46.000000000 -0800
+++ bin/Makefile.am	2014-03-07 09:37:25.000000000 -0800
@@ -11,7 +11,7 @@
 	-w
 
 dconf_LDADD = \
-	../client/libdconf.so.1		\
+	../client/libdconf.1.dylib	\
 	$(gio_LIBS)
 
 dconf_SOURCES = \
--- client/Makefile.am.orig	2014-03-07 09:38:42.000000000 -0800
+++ client/Makefile.am	2014-03-07 09:52:41.000000000 -0800
@@ -1,20 +1,20 @@
 include $(top_srcdir)/Makefile.gtester
 
 shlibdir=$(libdir)
-shlib_PROGRAMS = libdconf.so.1.0.0
-nodist_noinst_DATA = libdconf.so.1 libdconf.so
+shlib_PROGRAMS = libdconf.1.0.0.dylib
+nodist_noinst_DATA = libdconf.1.dylib libdconf.dylib
 noinst_LIBRARIES = libdconf-client.a
 
-libdconf.so.1 libdconf.so: libdconf.so.1.0.0
-	$(AM_V_GEN) ln -fs libdconf.so.1.0.0 $@
+libdconf.1.dylib libdconf.dylib: libdconf.1.0.0.dylib
+	$(AM_V_GEN) ln -fs libdconf.1.0.0.dylib $@
 
 install-data-hook:
-	ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so.1
-	ln -fs libdconf.so.1.0.0 $(DESTDIR)$(shlibdir)/libdconf.so
+	ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.1.dylib
+	ln -fs libdconf.1.0.0.dylib $(DESTDIR)$(shlibdir)/libdconf.dylib
 
 uninstall-hook:
-	rm -f $(DESTDIR)$(shlibdir)/libdconf.so.1
-	rm -f $(DESTDIR)$(shlibdir)/libdconf.so
+	rm -f $(DESTDIR)$(shlibdir)/libdconf.1.dylib
+	rm -f $(DESTDIR)$(shlibdir)/libdconf.dylib
 
 dconfinclude_HEADERS = dconf.h
 dconfclientinclude_HEADERS = dconf-client.h
@@ -24,16 +24,16 @@
 libdconf_client_a_SOURCES = \
 	dconf-client.c
 
-libdconf_so_1_0_0_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
-libdconf_so_1_0_0_LDADD = \
+libdconf_1_0_0_dylib_CFLAGS = $(libdconf_client_a_CFLAGS) -fPIC -DPIC
+libdconf_1_0_0_dylib_LDADD = \
 	../engine/libdconf-engine-shared.a		\
 	../common/libdconf-common-shared.a		\
 	../gdbus/libdconf-gdbus-thread-shared.a		\
 	../gvdb/libgvdb-shared.a			\
 	../shm/libdconf-shm-shared.a			\
 	$(gio_LIBS)
-libdconf_so_1_0_0_LDFLAGS = -shared -Wl,-soname=libdconf.so.1
-libdconf_so_1_0_0_SOURCES = $(libdconf_client_a_SOURCES)
+libdconf_1_0_0_dylib_LDFLAGS = -dynamiclib -install_name ${libdir}/libdconf.1.0.0.dylib
+libdconf_1_0_0_dylib_SOURCES = $(libdconf_client_a_SOURCES)
 
 EXTRA_DIST = dconf.vapi dconf.deps
 
@@ -43,4 +43,4 @@
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dconf.pc
 
-CLEANFILES = libdconf.so.1 libdconf.so
+CLEANFILES = libdconf.1.dylib libdconf.dylib