diff --git a/Makefile b/Makefile
index 3e1603e3d..bfbc04cd8 100644
--- a/Makefile
+++ b/Makefile
@@ -10,10 +10,10 @@ clean:
 	$(RM) buildah
 
 # For vendoring to work right, the checkout directory must be such that out top
-# level is at $GOPATH/src/github.com/nalind/buildah.
+# level is at $GOPATH/src/github.com/projectatomic/buildah.
 .PHONY: gopath
 gopath:
-	test $(shell pwd) = $(shell cd ../../../../src/github.com/nalind/buildah ; pwd)
+	test $(shell pwd) = $(shell cd ../../../../src/github.com/projectatomic/buildah ; pwd)
 
 # We use https://github.com/lk4d4/vndr to manage dependencies.
 .PHONY: deps
diff --git a/README.md b/README.md
index cdb45ff87..7a4070089 100644
--- a/README.md
+++ b/README.md
@@ -1,15 +1,15 @@
 buildah - a tool for building OCI images
 ========================================
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/nalind/buildah)](https://goreportcard.com/report/github.com/nalind/buildah)
-[![Travis](https://travis-ci.org/nalind/buildah.svg?branch=master)](https://travis-ci.org/nalind/buildah)
+[![Go Report Card](https://goreportcard.com/badge/github.com/projectatomic/buildah)](https://goreportcard.com/report/github.com/projectatomic/buildah)
+[![Travis](https://travis-ci.org/projectatomic/buildah.svg?branch=master)](https://travis-ci.org/projectatomic/buildah)
 
-Note: this package is pre-alpha, and will either move to an organization or be merged into a different project at some point.
+Note: this package is in alpha.
 
 The buildah package provides a command line tool which can be used to
 * create a working container, either from scratch or using an image as a starting point
 * mount the working container's root filesystem for manipulation
-* umount the working container's root filesystem
+* unmount the working container's root filesystem
 * use the updated contents of the container's root filesystem as a filesystem layer to create a new image
 * delete a working container
 
diff --git a/cmd/buildah/commit.go b/cmd/buildah/commit.go
index ba94387b7..d38037b34 100644
--- a/cmd/buildah/commit.go
+++ b/cmd/buildah/commit.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/containers/image/transports"
 	"github.com/containers/storage/pkg/archive"
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/common.go b/cmd/buildah/common.go
index bed5fa344..a6138ae3a 100644
--- a/cmd/buildah/common.go
+++ b/cmd/buildah/common.go
@@ -6,7 +6,7 @@ import (
 
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage/storage"
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/config.go b/cmd/buildah/config.go
index 6fdb48d52..2a80a9042 100644
--- a/cmd/buildah/config.go
+++ b/cmd/buildah/config.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/mattn/go-shellwords"
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/from.go b/cmd/buildah/from.go
index 07bdc9454..c18c529d2 100644
--- a/cmd/buildah/from.go
+++ b/cmd/buildah/from.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/list.go b/cmd/buildah/list.go
index 886f05aa8..9ed08a3e2 100644
--- a/cmd/buildah/list.go
+++ b/cmd/buildah/list.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/main.go b/cmd/buildah/main.go
index d5497e92f..e88ef1f82 100644
--- a/cmd/buildah/main.go
+++ b/cmd/buildah/main.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/containers/storage/pkg/reexec"
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/run.go b/cmd/buildah/run.go
index 7e48ed9f4..0d7cadfde 100644
--- a/cmd/buildah/run.go
+++ b/cmd/buildah/run.go
@@ -7,7 +7,7 @@ import (
 	"syscall"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/nalind/buildah"
+	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )