diff --git a/Assistant/WebApp/Configurators/AWS.hs b/Assistant/WebApp/Configurators/AWS.hs
index 68d8b8d627..45f9d773ac 100644
--- a/Assistant/WebApp/Configurators/AWS.hs
+++ b/Assistant/WebApp/Configurators/AWS.hs
@@ -76,8 +76,10 @@ s3InputAForm defcreds = AWSInput
 	storageclasses :: [(Text, StorageClass)]
 	storageclasses =
 		[ ("Standard redundancy", StandardRedundancy)
+#ifdef WITH_S3
 #if MIN_VERSION_aws(0,13,0)
 		, ("Infrequent access (cheaper for backups and archives)", StandardInfrequentAccess)
+#endif
 #endif
 		, ("Reduced redundancy (costs less)", ReducedRedundancy)
 		]
diff --git a/debian/changelog b/debian/changelog
index 548ba05934..5664e748b1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ git-annex (5.20150931) UNRELEASED; urgency=medium
     matches the key, unless annex.verify=false.
   * reinject: Already verified content; this can now be disabled by
     setting annex.verify=false.
+  * Allow building with S3 disabled again.
 
  -- Joey Hess <id@joeyh.name>  Thu, 01 Oct 2015 12:42:56 -0400
 
diff --git a/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn b/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn
index cdc64e51dc..5a1b480312 100644
--- a/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn
+++ b/doc/bugs/openbsd_-_Assistant__47__WebApp__47__Configurators__47__AWS.hs:79:0:_-_error:_missing_binary_operator_before_token___34____40____34__.mdwn
@@ -326,3 +326,5 @@ git-annex-5.20150930
 ### Have you had any luck using git-annex before? (Sometimes we get tired of reading bug reports all day and a lil' positive end note does wonders)
 
 Building without Assistant and Webapps flags work.
+
+> Fixed building without S3. [[done]] --[[Joey]]