diff --git a/catatonit-rpmlintrc b/catatonit-rpmlintrc
new file mode 100644
index 0000000..dbf3036
--- /dev/null
+++ b/catatonit-rpmlintrc
@@ -0,0 +1,3 @@
+# We need catatonit to be statically linked.
+addFilter ("^catatonit.*: W: statically-linked-binary /usr/bin/catatonit")
+addFilter ("^catatonit.*: W: position-independent-executable-suggested /usr/bin/catatonit")
diff --git a/catatonit.changes b/catatonit.changes
index c5eac87..0ec4fc9 100644
--- a/catatonit.changes
+++ b/catatonit.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Apr  6 18:31:08 UTC 2018 - asarai@suse.com
+
+- Fix build to correctly build a static binary (which will allow it to work in
+  all containers). This was caused by forgetting to include
+  'glibc-devel-static'. I've added a check to ensure it doesn't happen by
+  accident again.
+
 -------------------------------------------------------------------
 Tue Apr  3 23:27:27 UTC 2018 - jengelh@inai.de
 
diff --git a/catatonit.spec b/catatonit.spec
index ac1c9f3..03ad4e2 100644
--- a/catatonit.spec
+++ b/catatonit.spec
@@ -28,7 +28,9 @@ Source1:        %{name}-%{version}.tar.xz.asc
 Source2:        %{name}.keyring
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  file
 BuildRequires:  gcc
+BuildRequires:  glibc-devel-static
 BuildRequires:  libtool
 
 %description
@@ -49,6 +51,10 @@ autoreconf -fi
 %configure
 make %{?_smp_mflags}
 
+# Make sure we *always* build a static binary. Otherwise we'll break containers
+# that don't have the necessary shared libs.
+file ./%{name} | grep 'statically linked'
+
 %install
 %make_install
 ln -s %{_bindir}/%{name} %{buildroot}%{_bindir}/docker-init