diff --git a/README.md b/README.md
index 5c7541168..d77976533 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 
 ## Introduction
 
-`runc` is a CLI tool for spawning and running containers according to the OCI specification.
+`runc` is a CLI tool for spawning and running containers on Linux according to the OCI specification.
 
 ## Releases
 
@@ -23,8 +23,7 @@ A third party security audit was performed by Cure53, you can see the full repor
 
 ## Building
 
-`runc` currently supports the Linux platform with various architecture support.
-It must be built with Go version 1.15 or higher.
+`runc` only supports Linux. It must be built with Go version 1.15 or higher.
 
 In order to enable seccomp support you will need to install `libseccomp` on your platform.
 > e.g. `libseccomp-devel` for CentOS, or `libseccomp-dev` for Ubuntu
diff --git a/checkpoint.go b/checkpoint.go
index bf773a9ba..699284f60 100644
--- a/checkpoint.go
+++ b/checkpoint.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/delete.go b/delete.go
index fc0c73f93..6e6b463ef 100644
--- a/delete.go
+++ b/delete.go
@@ -1,5 +1,3 @@
-// +build !solaris
-
 package main
 
 import (
diff --git a/events.go b/events.go
index 0d1510667..6cdc01cdd 100644
--- a/events.go
+++ b/events.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/exec.go b/exec.go
index f8baff3d1..3649bdc1b 100644
--- a/exec.go
+++ b/exec.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/kill.go b/kill.go
index 46ea7003b..e5b13b123 100644
--- a/kill.go
+++ b/kill.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/list.go b/list.go
index 5a1c08503..38d9869d4 100644
--- a/list.go
+++ b/list.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/notify_socket.go b/notify_socket.go
index e578dbf8a..00ca672d3 100644
--- a/notify_socket.go
+++ b/notify_socket.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/pause.go b/pause.go
index 224c79f33..a7f0aaccc 100644
--- a/pause.go
+++ b/pause.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/ps.go b/ps.go
index cbbb670bf..4083e559d 100644
--- a/ps.go
+++ b/ps.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/restore.go b/restore.go
index f7081e4cf..4e2841ba2 100644
--- a/restore.go
+++ b/restore.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/run.go b/run.go
index f8d631784..584adbb1f 100644
--- a/run.go
+++ b/run.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/signals.go b/signals.go
index 250764c76..2555b765b 100644
--- a/signals.go
+++ b/signals.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/spec.go b/spec.go
index 4dc4c028b..87d6ebea8 100644
--- a/spec.go
+++ b/spec.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/state.go b/state.go
index 718813c36..b645e5ab6 100644
--- a/state.go
+++ b/state.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/tty.go b/tty.go
index 310643847..10106a954 100644
--- a/tty.go
+++ b/tty.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (
diff --git a/update.go b/update.go
index 7db5879d2..d02e7af90 100644
--- a/update.go
+++ b/update.go
@@ -1,5 +1,3 @@
-// +build linux
-
 package main
 
 import (