diff --git a/CHANGELOG.md b/CHANGELOG.md
index a446f2bece..2c016de3ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,8 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Added `alarm`. ([#830](https://github.com/nix-rust/nix/pull/830))
 - Added interface flags `IFF_NO_PI, IFF_TUN, IFF_TAP` on linux-like systems.
   ([#853](https://github.com/nix-rust/nix/pull/853))
+- Added `statvfs` module to all MacOS and Linux architectures.
+  ([#832](https://github.com/nix-rust/nix/pull/832))
 
 ### Changed
 - Display and Debug for SysControlAddr now includes all fields.
diff --git a/src/sys/mod.rs b/src/sys/mod.rs
index 55c3d5d27b..972a1b5ea3 100644
--- a/src/sys/mod.rs
+++ b/src/sys/mod.rs
@@ -54,19 +54,9 @@ pub mod socket;
 
 pub mod stat;
 
-#[cfg(all(target_os = "linux",
-          any(target_arch = "x86",
-              target_arch = "x86_64",
-              target_arch = "arm")),
-          )]
+#[cfg(any(target_os = "android", target_os = "linux", target_os = "macos"))]
 pub mod statfs;
 
-#[cfg(all(any(target_os = "linux",
-              target_os = "macos"),
-          any(target_arch = "x86",
-              target_arch = "x86_64",
-              target_arch = "arm")),
-          )]
 pub mod statvfs;
 
 pub mod termios;
diff --git a/src/sys/statvfs.rs b/src/sys/statvfs.rs
index 41ca44f2a1..845ae0dbd5 100644
--- a/src/sys/statvfs.rs
+++ b/src/sys/statvfs.rs
@@ -32,13 +32,13 @@ libc_bitflags!(
         #[cfg(any(target_os = "android", target_os = "linux"))]
         ST_MANDLOCK;
         /// Write on file/directory/symlink
-        #[cfg(any(target_os = "android", target_os = "linux"))]
+        #[cfg(target_os = "linux")]
         ST_WRITE;
         /// Append-only file
-        #[cfg(any(target_os = "android", target_os = "linux"))]
+        #[cfg(target_os = "linux")]
         ST_APPEND;
         /// Immutable file
-        #[cfg(any(target_os = "android", target_os = "linux"))]
+        #[cfg(target_os = "linux")]
         ST_IMMUTABLE;
         /// Do not update access times on files
         #[cfg(any(target_os = "android", target_os = "linux"))]