diff --git a/Makefile.am b/Makefile.am
index db28efd5..c2accc26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,7 @@ endif
 bin_SCRIPTS = gparted
 CLEANFILES = $(bin_SCRIPTS) $(DESKTOP_IN_FILES) $(polkit_action_in_FILES)
 
-do_subst = sed -e 's,[@]sbindir[@],$(sbindir),g' \
+do_subst = sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
 	-e 's,[@]bindir[@],$(bindir),g' \
 	-e 's,[@]gksuprog[@],$(GKSUPROG),g' \
 	-e 's,[@]enable_xhost_root[@],$(ENABLE_XHOST_ROOT),g'
diff --git a/gparted.in b/gparted.in
index d198ad71..185a73f2 100755
--- a/gparted.in
+++ b/gparted.in
@@ -39,7 +39,7 @@ fi
 #
 #  Define base command for executing GParted
 #
-BASE_CMD="@sbindir@/gpartedbin $*"
+BASE_CMD="@libexecdir@/gpartedbin $*"
 
 #
 #  For non-root users try to get authorisation to run GParted as root.
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a7a1827..1234a4a4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,7 +8,7 @@ AM_CFLAGS = -Wall
 
 AM_CXXFLAGS = -Wall	
 
-sbin_PROGRAMS = gpartedbin
+libexec_PROGRAMS = gpartedbin
 
 gpartedbin_SOURCES = \
 	BlockSpecial.cc			\