diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..5b840e9
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,4 @@
+.dockerignore
+/*.sh
+/build
+Dockerfile
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b0d389b..a53606c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,13 +12,14 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 find_package(PkgConfig REQUIRED)
 pkg_check_modules(OGG REQUIRED ogg)
 add_compile_options(${OGG_CFLAGS})
+link_directories(${OGG_LIBRARY_DIRS})
 
 configure_file(src/config.h.in config.h @ONLY)
-include_directories(BEFORE src "${CMAKE_BINARY_DIR}")
+include_directories(BEFORE src "${CMAKE_BINARY_DIR}" ${OGG_INCLUDE_DIRS})
 
 add_library(
 	libopustags
-	OBJECT
+	STATIC
 	src/cli.cc
 	src/ogg.cc
 	src/opus.cc
@@ -26,6 +27,10 @@ add_library(
 )
 target_link_libraries(libopustags PUBLIC ${OGG_LIBRARIES})
 
+if (APPLE)
+	target_link_libraries(libopustags PUBLIC iconv)
+endif()
+
 add_executable(opustags src/opustags.cc)
 target_link_libraries(opustags libopustags)
 
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..ab31554
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,20 @@
+# This dockerfile can be used to both build a containerized version of the application
+# and to self-test its build.
+# * To self-test, simply `docker build -t opustags .`; `make check` is run as the final step anyway.
+# * To use the dockerized version, `docker run -it opustags opustags -h` (etc.)
+
+FROM ubuntu:18.04
+RUN apt-get update
+RUN apt-get install --no-install-recommends -y make cmake g++ libogg-dev pkg-config ffmpeg liblist-moreutils-perl locales
+RUN locale-gen en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+ADD . /src
+WORKDIR /build
+RUN env CXX=g++ cmake /src && make && make install
+# We need to run tests as a regular user, since on Docker /dev is a writable directory
+# for root (it's backed by a tmpfs).  This would make the "device as partial file" test fail.
+RUN useradd ubuntu
+RUN mkdir -p /build && chown -R ubuntu:ubuntu /build /src
+USER ubuntu
+RUN env CXX=g++ make check
\ No newline at end of file
diff --git a/src/cli.cc b/src/cli.cc
index 2ba1040..a4badb5 100644
--- a/src/cli.cc
+++ b/src/cli.cc
@@ -12,6 +12,7 @@
 #include <config.h>
 #include <opustags.h>
 
+#include <errno.h>
 #include <getopt.h>
 #include <limits.h>
 #include <string.h>
diff --git a/src/ogg.cc b/src/ogg.cc
index 281ee8e..84080fa 100644
--- a/src/ogg.cc
+++ b/src/ogg.cc
@@ -10,6 +10,7 @@
 
 #include <opustags.h>
 
+#include <errno.h>
 #include <string.h>
 
 using namespace std::literals::string_literals;
diff --git a/src/system.cc b/src/system.cc
index e9d6b01..1f28789 100644
--- a/src/system.cc
+++ b/src/system.cc
@@ -11,7 +11,9 @@
 
 #include <opustags.h>
 
+#include <errno.h>
 #include <string.h>
+#include <unistd.h>
 
 ot::status ot::partial_file::open(const char* destination)
 {