diff --git a/Changelog.md b/Changelog.md
index 21914d7cf..e410bf629 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -7,6 +7,7 @@
    * Fixed a bug that causes it not to print messages to stdout when there is no pseudo terminal. This is because Python buffers stdout by default.
    * Fixed an incorrectly printed message.
  * The baseimage-docker image no longer EXPOSEs any ports by default. The EXPOSE entries were originally there to enable some default guest-to-host port forwarding entries, but in recent Docker versions they changed the meaning of EXPOSE, and now EXPOSE is used for linking containers. As such, we no longer have a reason to EXPOSE any ports by default. Fixes GH-15.
+ * Fixed syslog-ng not being able to start because of a missing afsql module. Fixes the issue described in [pull request 7](https://github.com/phusion/baseimage-docker/pull/7).
 
 ## 0.9.6 (release date: 2014-02-17)
 
diff --git a/image/config/syslog_ng_default b/image/config/syslog_ng_default
new file mode 100644
index 000000000..7161dbc19
--- /dev/null
+++ b/image/config/syslog_ng_default
@@ -0,0 +1,13 @@
+# If a variable is not set here, then the corresponding
+# parameter will not be changed.
+# If a variables is set, then every invocation of
+# syslog-ng's init script will set them using dmesg.
+
+# log level of messages which should go to console
+# see syslog(3) for details
+#
+#CONSOLE_LOG_LEVEL=1
+
+# Command line options to syslog-ng
+# We set --default-modules because of https://github.com/phusion/baseimage-docker/pull/7.
+SYSLOGNG_OPTS="--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat"
diff --git a/image/runit/syslog-ng b/image/runit/syslog-ng
index 1fdedbcaf..f450b4bf9 100755
--- a/image/runit/syslog-ng
+++ b/image/runit/syslog-ng
@@ -1,3 +1,24 @@
 #!/bin/sh
 set -e
-exec syslog-ng -F -p /var/run/syslog-ng.pid
\ No newline at end of file
+
+SYSLOGNG_OPTS=""
+
+[ -r /etc/default/syslog-ng ] && . /etc/default/syslog-ng
+
+case "x$CONSOLE_LOG_LEVEL" in
+  x[1-8])
+    dmesg -n $CONSOLE_LOG_LEVEL
+    ;;
+  x)
+    ;;
+  *)
+    echo "CONSOLE_LOG_LEVEL is of unaccepted value."
+    ;;
+esac
+
+if [ ! -e /dev/xconsole ]
+then
+  mknod -m 640 /dev/xconsole p
+fi
+
+exec syslog-ng -F -p /var/run/syslog-ng.pid $SYSLOGNG_OPTS
diff --git a/image/system_services.sh b/image/system_services.sh
index d466f1e60..5cffda68b 100755
--- a/image/system_services.sh
+++ b/image/system_services.sh
@@ -15,6 +15,7 @@ $minimal_apt_get_install syslog-ng-core
 mkdir /etc/service/syslog-ng
 cp /build/runit/syslog-ng /etc/service/syslog-ng/run
 mkdir -p /var/lib/syslog-ng
+cp /build/config/syslog_ng_default /etc/default/syslog-ng
 
 ## Install the SSH server.
 $minimal_apt_get_install openssh-server