Index: src/github.com/containers/skopeo/Makefile
--- src/github.com/containers/skopeo/Makefile.orig	2020-03-16 09:47:33.000000000 +0100
+++ src/github.com/containers/skopeo/Makefile	2020-03-16 09:55:17.092301000 +0100
@@ -30,7 +30,7 @@
 endif
 
 CONTAINER_RUNTIME := $(shell command -v podman 2> /dev/null || echo docker)
-GOMD2MAN ?= $(shell command -v go-md2man || echo '$(GOBIN)/go-md2man')
+GOMD2MAN ?= md2man
 
 # Go module support: set `-mod=vendor` to use the vendored sources.
 # See also hack/make.sh.
@@ -107,7 +107,7 @@
 
 # Build w/o using containers
 binary-local:
-	$(GPGME_ENV) $(GO) build $(MOD_VENDOR) ${GO_DYN_FLAGS} -ldflags "-X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo
+	$(GPGME_ENV) $(GO) build -v $(MOD_VENDOR) ${GO_DYN_FLAGS} -ldflags "-X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo
 
 binary-local-static:
 	$(GPGME_ENV) $(GO) build $(MOD_VENDOR) -ldflags "-extldflags \"-static\" -X main.gitCommit=${GIT_COMMIT}" -gcflags "$(GOGCFLAGS)" -tags "$(BUILDTAGS)" -o skopeo ./cmd/skopeo
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go.orig	2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/drivers/driver_freebsd.go	2020-03-16 09:55:17.092465000 +0100
@@ -1,8 +1,6 @@
 package graphdriver
 
 import (
-	"syscall"
-
 	"golang.org/x/sys/unix"
 )
 
@@ -16,7 +14,7 @@
 // Mounted checks if the given path is mounted as the fs type
 func Mounted(fsType FsMagic, mountPath string) (bool, error) {
 	var buf unix.Statfs_t
-	if err := syscall.Statfs(mountPath, &buf); err != nil {
+	if err := unix.Statfs(mountPath, &buf); err != nil {
 		return false, err
 	}
 	return FsMagic(buf.Type) == fsType, nil
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go.orig	2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mounter_unsupported.go	2020-03-16 09:55:17.092603000 +0100
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!freebsd
 
 package mount
 
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go.orig	2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/mount/mountinfo_unsupported.go	2020-03-16 09:55:39.262143000 +0100
@@ -1,4 +1,4 @@
-// +build !linux
+// +build !linux,!freebsd
 
 package mount
 
Index: src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go
--- src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go.orig	2020-03-16 09:47:34.000000000 +0100
+++ src/github.com/containers/skopeo/vendor/github.com/containers/storage/pkg/system/mknod.go	2020-03-16 09:55:17.092731000 +0100
@@ -9,7 +9,7 @@
 // Mknod creates a filesystem node (file, device special file or named pipe) named path
 // with attributes specified by mode and dev.
 func Mknod(path string, mode uint32, dev int) error {
-	return unix.Mknod(path, mode, dev)
+	return unix.Mknod(path, mode, uint64(dev))
 }
 
 // Mkdev is used to build the value of linux devices (in /dev/) which specifies major