diff --git a/autoconf.spec b/autoconf.spec
index 59018a5..201054a 100644
--- a/autoconf.spec
+++ b/autoconf.spec
@@ -1,7 +1,7 @@
 Summary:    A GNU tool for automatically configuring source code
 Name:       autoconf
 Version:    2.69
-Release:    16%{?dist}
+Release:    17%{?dist}
 License:    GPLv2+ and GFDL
 Group:      Development/Tools
 Source0:    http://ftpmirror.gnu.org/autoconf/autoconf-%{version}.tar.xz
@@ -100,6 +100,10 @@ fi
 %doc AUTHORS COPYING* ChangeLog NEWS README THANKS TODO
 
 %changelog
+* Fri Feb 27 2015 Pavel Raiskup <praiskup@redhat.com> - 2.69-17
+- config.site: take AC_PREFIX_DEFAULT([/usr]) into account, by
+  agruen at kernel.org (rhbz#1196340)
+
 * Wed Nov 12 2014 Pavel Raiskup <praiskup@redhat.com> - 2.69-16
 - avoid generating empty man pages for gnuconfig (#1162227)
 
diff --git a/config.site b/config.site
index f5d8d70..5bea225 100644
--- a/config.site
+++ b/config.site
@@ -12,7 +12,9 @@ if test -n "$host"; then
     return 0
 fi
 
-if test "$prefix" = /usr; then
+if test "$prefix" = /usr \
+   || { test "$prefix" = NONE && test "$ac_default_prefix" = /usr ; }
+then
     test "$sysconfdir" = '${prefix}/etc' && sysconfdir=/etc
     test "$sharedstatedir" = '${prefix}/com' && sharedstatedir=/var
     test "$localstatedir" = '${prefix}/var' && localstatedir=/var