diff --git a/distrib/docker/Dockerfile b/Dockerfile
similarity index 78%
rename from distrib/docker/Dockerfile
rename to Dockerfile
index 30d5da16..436a0cbb 100644
--- a/distrib/docker/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,18 @@
 ## build Oragono
 FROM golang:1.14-alpine AS build-env
 
-RUN apk add --no-cache git make curl
+RUN apk add --no-cache git make curl sed
 
 # copy oragono
 RUN mkdir -p /go/src/github.com/oragono/oragono
 WORKDIR /go/src/github.com/oragono/oragono
 ADD . /go/src/github.com/oragono/oragono/
 
+# modify default config file so that it doesn't die on IPv6
+# and so it can be exposed via 6667 by default
+run sed -i 's/^\(\s*\)\"127.0.0.1:6667\":.*$/\1":6667":/' /go/src/github.com/oragono/oragono/oragono.yaml
+run sed -i 's/^\s*\"\[::1\]:6667\":.*$//' /go/src/github.com/oragono/oragono/oragono.yaml
+
 # make sure submodules are up-to-date
 RUN git submodule update --init
 
@@ -36,6 +41,7 @@ RUN mkdir -p /ircd-bin
 COPY --from=build-env /go/bin/oragono /ircd-bin
 COPY --from=build-env /go/src/github.com/oragono/oragono/languages /ircd-bin/languages/
 COPY --from=build-env /go/src/github.com/oragono/oragono/oragono.yaml /ircd-bin/oragono.yaml
+
 COPY distrib/docker/run.sh /ircd-bin/run.sh
 RUN chmod +x /ircd-bin/run.sh