diff --git a/src/freedombone-app-irc b/src/freedombone-app-irc
index 301f7812..d71b98e1 100755
--- a/src/freedombone-app-irc
+++ b/src/freedombone-app-irc
@@ -40,6 +40,9 @@ IRC_PORT=6698
 # An optional password to log into IRC. This applies to all users
 IRC_PASSWORD=
 
+# Number of entries for the bouncer to buffer
+IRC_BUFFER_LENGTH=100
+
 irc_variables=(MY_USERNAME
                MY_NAME
                IRC_PORT
@@ -49,6 +52,7 @@ irc_variables=(MY_USERNAME
                IRC_OPERATOR_PASSWORD
                DEFAULT_DOMAIN_NAME
                INSTALLED_WITHIN_DOCKER
+               IRC_BUFFER_LENGTH
                ONION_ONLY)
 
 function start_irc_bouncer {
@@ -121,7 +125,7 @@ function add_user_irc_bouncer {
     echo "    AltNick    = ${new_username}_" >> /home/znc/.znc/configs/znc.conf
     echo "    Ident      = ${new_username}" >> /home/znc/.znc/configs/znc.conf
     echo "    RealName   = ${new_username}" >> /home/znc/.znc/configs/znc.conf
-    echo '    Buffer     = 100' >> /home/znc/.znc/configs/znc.conf
+    echo "    Buffer     = $IRC_BUFFER_LENGTH" >> /home/znc/.znc/configs/znc.conf
     echo '    AutoClearChanBuffer = true' >> /home/znc/.znc/configs/znc.conf
     echo '    ChanModes  = +stn' >> /home/znc/.znc/configs/znc.conf
     echo '' >> /home/znc/.znc/configs/znc.conf