diff --git a/bin/Makefile.am b/bin/Makefile.am
index a7ef6740b52..c85c9656975 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,7 +1,5 @@
-ringlibdir = $(libdir)/ring
-
 if HAVE_WIN32
-ringlib_PROGRAMS = ringcli
+libexec_PROGRAMS = ringcli
 ringcli_SOURCES = winmain.cpp
 ringcli_CXXFLAGS = -I$(top_srcdir)/src \
                    -I$(top_srcdir)/src/dring \
@@ -11,7 +9,7 @@ ringcli_LDADD = $(top_builddir)/src/libring.la
 endif
 
 if HAVE_OSX
-ringlib_PROGRAMS = ringcli
+libexec_PROGRAMS = ringcli
 ringcli_SOURCES = osxmain.cpp
 ringcli_CXXFLAGS = -I$(top_srcdir)/src \
                    -I$(top_srcdir)/src/dring \
@@ -25,7 +23,7 @@ SUBDIRS=
 if RING_DBUS
 SUBDIRS+=dbus
 
-ringlib_PROGRAMS = dring
+libexec_PROGRAMS = dring
 
 dring_SOURCES = main.cpp
 
diff --git a/bin/dbus/Makefile.am b/bin/dbus/Makefile.am
index fb856f398fc..34b7d8f0aee 100644
--- a/bin/dbus/Makefile.am
+++ b/bin/dbus/Makefile.am
@@ -65,6 +65,12 @@ libclient_dbus_la_CXXFLAGS = -I../ \
             -DPROGSHAREDIR=\"${datadir}/ring\" \
             $(DBUSCPP_CFLAGS)
 
+do_subst = $(SED) \
+	-e 's,[@]bindir[@],$(bindir),g'
+
+cx.ring.Ring.service: cx.ring.Ring.service.in Makefile
+	$(do_subst) < $< > $@
+
 # Dbus service file
 servicedir = $(datadir)/dbus-1/services
 service_DATA = cx.ring.Ring.service
diff --git a/bin/dbus/cx.ring.Ring.service.in b/bin/dbus/cx.ring.Ring.service.in
index 4312a8dfb0b..a1f7fa5020d 100644
--- a/bin/dbus/cx.ring.Ring.service.in
+++ b/bin/dbus/cx.ring.Ring.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=cx.ring.Ring
-Exec=@LIBDIR@/ring/dring
+Exec=@libexec@/dring
diff --git a/configure.ac b/configure.ac
index 59de86c20a7..4b0043658a8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -381,24 +381,21 @@ AC_ARG_WITH([dbus],
   [AS_HELP_STRING([--without-dbus], [disable support for dbus])],
   [],
   [with_dbus=yes])
-AS_IF([test "x$with_dbus" = "xyes"], [
-  PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,,
-    AC_MSG_WARN([Missing dbus development files]))
+AS_IF([test "x$with_dbus" = "xyes"],
+  [PKG_CHECK_MODULES(DBUSCPP, dbus-c++-1,,
+     AC_MSG_WARN([Missing dbus development files]))
 
-  AS_AC_EXPAND(LIBDIR, $libdir)
-  AC_SUBST(LIBDIR)
+   AC_CONFIG_FILES([bin/dbus/Makefile])
 
-  AC_CONFIG_FILES([bin/dbus/Makefile
-                   bin/dbus/cx.ring.Ring.service])
+   AC_PATH_PROG([DBUSXX_XML2CPP], dbusxx-xml2cpp,
+     [AC_MSG_ERROR([dbusxx-xml2cpp not found])])
 
-  AC_PATH_PROG([DBUSXX_XML2CPP], dbusxx-xml2cpp,
-    [AC_MSG_ERROR([dbusxx-xml2cpp not found])])
-
-  AS_IF([test "x$CLANG" = "xyes"],
-    [AC_MSG_ERROR([dbus does not compile when clang is used,
-                   rerun with --without-dbus])]);
-  AM_CONDITIONAL(RING_DBUS, true)],TESTS= $(check_PROGRAMS)
-  AM_CONDITIONAL(RING_DBUS, false));
+   AS_IF([test "x$CLANG" = "xyes"],
+     [AC_MSG_ERROR([dbus does not compile when clang is used,
+                    rerun with --without-dbus])]);
+   AM_CONDITIONAL(RING_DBUS, true)],
+  [TESTS= $(check_PROGRAMS)
+   AM_CONDITIONAL(RING_DBUS, false)]);
 
 dnl name service is default-enabled
 AC_ARG_ENABLE([ringns], AS_HELP_STRING([--disable-ringns],
diff --git a/globals.mk b/globals.mk
index 888a9fd9427..b28405fe42f 100644
--- a/globals.mk
+++ b/globals.mk
@@ -1,7 +1,6 @@
 # Global variables
 
 src=$(abs_top_srcdir)
-ringlibdir=$(DESTDIR)$(libdir)/ring
 
 ASTYLERC="$(top_srcdir)/../astylerc"
 indent="/usr/bin/astyle"