diff --git a/manifests/setup.pp b/manifests/setup.pp
index 4170ee4e4e88056ed3395add5436d1be9380b5d2..d8f925d3ad3ebe50b545502230a17320334813b3 100644
--- a/manifests/setup.pp
+++ b/manifests/setup.pp
@@ -1,10 +1,12 @@
 class irc_bouncer::setup {
   require ::irc_bouncer::pre
-  # TODO This setup?
-  # require ::profiles::lysator_repo
-
+  require ::profiles::lysator_repo
 
+  # We use a self-packaged version of ZNC, whose package source is
+  # available at:
   # https://git.lysator.liu.se/hugo/deb-znc
+  # It also comes bundled with a lysator module.
+
   ensure_packages ( ['znc'],
     { ensure => latest, })
 
@@ -48,20 +50,6 @@ class irc_bouncer::setup {
     owner  => 'znc',
   }
 
-  # vcsrepo { '/var/lib/znc/znc-lysator':
-  #   ensure   => latest,
-  #   provider => git,
-  #   source   => 'https://git.lysator.liu.se/hugo/znc-lysator',
-  #   revision => 'release',
-  # } ~> exec { 'build znc-lysator':
-  #   cwd     => '/var/lib/znc/znc-lysator',
-  #   command => 'make',
-  #   path    => '/usr/bin:/bin',
-  # } ~> file { '/usr/lib/znc/lysconf.so':
-  #   ensure => present,
-  #   source => '/var/lib/znc/znc-lysator/lysconf.so',
-  # }
-
   file { '/var/lib/znc/configs/znc.conf':
     ensure  => present,
     replace => no,
@@ -69,6 +57,8 @@ class irc_bouncer::setup {
     owner   => 'znc',
   }
 
+  # lysconf module comes bundled with lysator-version of znc
+
   irc_bouncer::module { [ 'webadmin',
                           'fail2ban',
                           'chansaver',