diff --git a/configure.ac b/configure.ac
index d5e902906..869f1a807 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,10 +16,6 @@ AC_SUBST([LIBSUBID_ABI_MINOR], [libsubid_abi_minor])
 AC_SUBST([LIBSUBID_ABI_MICRO], [libsubid_abi_micro])
 AC_SUBST([LIBSUBID_ABI], [libsubid_abi])
 
-dnl Some hacks...
-test "$prefix" = "NONE" && prefix="/usr"
-test "$prefix" = "/usr" && exec_prefix=""
-
 AC_USE_SYSTEM_EXTENSIONS
 
 AC_ENABLE_STATIC
diff --git a/src/Makefile.am b/src/Makefile.am
index 698181509..7dd2cc928 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,8 +2,8 @@
 EXTRA_DIST = \
 	.indent.pro
 
-ubindir = ${prefix}/bin
-usbindir = ${prefix}/sbin
+ubindir = ${exec_prefix}/bin
+usbindir = ${exec_prefix}/sbin
 suidperms = 4755
 sgidperms = 2755
 
@@ -24,7 +24,7 @@ AM_CFLAGS = $(LIBBSD_CFLAGS)
 #
 # also /lib/libshadow.so.x.xx (if any) could be moved to /usr/lib
 # and installation would be much simpler (just two directories,
-# $prefix/bin and $prefix/sbin, no install-data hacks...)
+# $exec_prefix/bin and $exec_prefix/sbin, no install-data hacks...)
 
 bin_PROGRAMS   = login
 sbin_PROGRAMS  = nologin