diff --git a/Makefile b/Makefile
index 9a9311a..9827b5d 100644
--- a/Makefile
+++ b/Makefile
@@ -56,8 +56,8 @@ browser-asmjs.test: browser-asmjs
 #
 # manylinux-x64
 #
-manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker
-	sed '/common.docker/ r common.docker' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
+manylinux-x64/Dockerfile: manylinux-x64/Dockerfile.in common.docker common.manylinux
+	sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x64/Dockerfile.in > manylinux-x64/Dockerfile
 
 manylinux-x64: manylinux-x64/Dockerfile
 	$(DOCKER) build -t $(ORG)/manylinux-x64 \
@@ -74,8 +74,8 @@ manylinux-x64.test: manylinux-x64
 #
 # manylinux-x86
 #
-manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker
-	sed '/common.docker/ r common.docker' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
+manylinux-x86/Dockerfile: manylinux-x86/Dockerfile.in common.docker common.manylinux
+	sed -e '/common.docker/ r common.docker' -e '/common.manylinux/ r common.manylinux' manylinux-x86/Dockerfile.in > manylinux-x86/Dockerfile
 
 manylinux-x86: manylinux-x86/Dockerfile
 	$(DOCKER) build -t $(ORG)/manylinux-x86 \
diff --git a/common.manylinux b/common.manylinux
new file mode 100644
index 0000000..bd9664a
--- /dev/null
+++ b/common.manylinux
@@ -0,0 +1,13 @@
+RUN cd /opt && \
+  wget "http://smarden.org/runit/runit-2.1.2.tar.gz" && \
+  tar xvzf runit-2.1.2.tar.gz && \
+  cd admin/runit-2.1.2 && \
+  ./package/install
+
+COPY manylinux-common/install-python-packages.sh /usr/local/bin
+RUN /usr/local/bin/install-python-packages.sh
+
+RUN yum -y install sudo && \
+  sed -i 's/Defaults    requiretty/#Defaults    requiretty/' /etc/sudoers && \
+  visudo -c
+
diff --git a/manylinux-x64/Dockerfile.in b/manylinux-x64/Dockerfile.in
index 01a0e71..2f24c81 100644
--- a/manylinux-x64/Dockerfile.in
+++ b/manylinux-x64/Dockerfile.in
@@ -3,16 +3,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 #include "common.docker"
 
-RUN cd /opt && \
-  wget "http://smarden.org/runit/runit-2.1.2.tar.gz" && \
-  tar xvzf runit-2.1.2.tar.gz && \
-  cd admin/runit-2.1.2 && \
-  ./package/install
-
-COPY manylinux-common/install-python-packages.sh /usr/local/bin
-RUN /usr/local/bin/install-python-packages.sh
-
-RUN yum -y install sudo
+#include "common.manylinux"
 
 ENV CROSS_TRIPLE x86_64-linux-gnu
 ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin
diff --git a/manylinux-x86/Dockerfile.in b/manylinux-x86/Dockerfile.in
index 7eacb85..0cc12e5 100644
--- a/manylinux-x86/Dockerfile.in
+++ b/manylinux-x86/Dockerfile.in
@@ -3,16 +3,7 @@ MAINTAINER Matt McCormick "matt.mccormick@kitware.com"
 
 #include "common.docker"
 
-RUN cd /opt && \
-  wget "http://smarden.org/runit/runit-2.1.2.tar.gz" && \
-  tar xvzf runit-2.1.2.tar.gz && \
-  cd admin/runit-2.1.2 && \
-  ./package/install
-
-COPY manylinux-common/install-python-packages.sh /usr/local/bin
-RUN /usr/local/bin/install-python-packages.sh
-
-RUN yum -y install sudo
+#include "common.manylinux"
 
 ENV CROSS_TRIPLE i686-linux-gnu
 ENV CROSS_ROOT /opt/rh/devtoolset-2/root/usr/bin