@@ -205,7 +205,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -151,7 +151,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -162,7 +162,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor seccomp selinux

+ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -154,7 +154,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor selinux

+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -133,7 +133,7 @@ RUN useradd --create-home --gid docker unprivilegeduser

 VOLUME /var/lib/docker

 WORKDIR /go/src/github.com/docker/docker

-ENV DOCKER_BUILDTAGS apparmor selinux

+ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux

 # Let us use a .bashrc file

 RUN ln -sfv $PWD/.bashrc ~/.bashrc

@@ -113,7 +113,7 @@ fi

 if [ "$DOCKER_EXPERIMENTAL" ]; then

 	echo >&2 '# WARNING! DOCKER_EXPERIMENTAL is set: building experimental features'

 	echo >&2

-	DOCKER_BUILDTAGS+=" experimental pkcs11"

+	DOCKER_BUILDTAGS+=" experimental"

 fi

 if [ -z "$DOCKER_CLIENTONLY" ]; then

@@ -5,8 +5,8 @@ VERSION = $(shell cat VERSION)

 override_dh_gencontrol:

 	# if we're on Ubuntu, we need to Recommends: apparmor

 	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars

-	# if we are building experimental we recommend yubico-piv-tool

-	echo 'yubico:Recommends=$(shell [ "$DOCKER_EXPERIMENTAL" ] && echo "yubico-piv-tool (>= 1.1.0~)")' >> debian/docker-engine.substvars

+	# recommend yubico-piv-tool since we include pkcs11 by default

+	echo 'yubico:Recommends="yubico-piv-tool (>= 1.1.0~)"' >> debian/docker-engine.substvars

 	dh_gencontrol

 override_dh_auto_build:

@@ -60,12 +60,10 @@ Requires: device-mapper >= 1.02.90-2

 %global with_selinux 1

 %endif

-%if 0%{?_experimental}

-# yubico-piv-tool conditional

+# yubico-piv-tool recommends

 %if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7

 Requires: yubico-piv-tool >= 1.1.0

 %endif

-%endif

 # start if with_selinux

 %if 0%{?with_selinux}

@@ -36,7 +36,7 @@ if [ "$(go env GOOS)" == "linux" ] ; then

 	esac

 fi

-if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ] && [ "$DOCKER_EXPERIMENTAL" ]; then

+if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then

 	if  [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then

 		export CGO_ENABLED=1

 		export CC=o64-clang

@@ -60,7 +60,7 @@ To build the Docker daemon, you will additionally need:

 * btrfs-progs version 3.16.1 or later (unless using an older version is

   absolutely necessary, in which case 3.8 is the minimum)

 * libseccomp version 2.2.1 or later (for build tag seccomp)

-* yubico-piv-tool version 1.1.0 or later (for experimental)

+* yubico-piv-tool version 1.1.0 or later

 Be sure to also check out Docker's Dockerfile for the most up-to-date list of

 these build-time dependencies.