diff --git a/Makefile.am b/Makefile.am
index e88b0d3e..5a562ebf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,10 +20,11 @@ APPDATA_FILES =$(APPDATA_IN_FILES:.xml.in=.xml)
 appdatadir = $(datadir)/appdata
 appdata_DATA = $(APPDATA_FILES)
 
-sbin_SCRIPTS = gparted
-CLEANFILES = $(sbin_SCRIPTS) $(DESKTOP_IN_FILES)
+bin_SCRIPTS = gparted
+CLEANFILES = $(bin_SCRIPTS) $(DESKTOP_IN_FILES)
 
-do_subst = sed -e 's,[@]installdir[@],$(sbindir),g' \
+do_subst = sed -e 's,[@]sbindir[@],$(sbindir),g' \
+	-e 's,[@]bindir[@],$(bindir),g' \
 	-e 's,[@]gksuprog[@],$(GKSUPROG),g'
 
 gparted.desktop.in:  gparted.desktop.in.in Makefile
diff --git a/gparted.desktop.in.in b/gparted.desktop.in.in
index 394eda68..3712b7dc 100644
--- a/gparted.desktop.in.in
+++ b/gparted.desktop.in.in
@@ -3,7 +3,7 @@ _Name=GParted
 _GenericName=Partition Editor
 _X-GNOME-FullName=GParted Partition Editor
 _Comment=Create, reorganize, and delete partitions
-Exec=@installdir@/gparted %f
+Exec=@bindir@/gparted %f
 Icon=gparted
 Terminal=false
 Type=Application
diff --git a/gparted.in b/gparted.in
index 68902cb3..4eb63005 100755
--- a/gparted.in
+++ b/gparted.in
@@ -39,7 +39,7 @@ fi
 #
 #  Define base command for executing GParted
 #
-BASE_CMD="@installdir@/gpartedbin $*"
+BASE_CMD="@sbindir@/gpartedbin $*"
 
 #
 #  For non-root users try to get authorisation to run GParted as root.
@@ -56,7 +56,7 @@ if test "x`id -u`" != "x0"; then
 		exit 1
 	fi
 
-	@gksuprog@ '@installdir@/gparted' "$@"
+	@gksuprog@ '@bindir@/gparted' "$@"
 	exit $?
 fi