18 files changed, 32 insertions, 50 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fa0fe2f..5152bb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -232,7 +232,7 @@ endforeach (page)
 set (CPACK_PACKAGE_DESCRIPTION_SUMMARY "Experimental IRC client, daemon and bot")
 set (CPACK_PACKAGE_VERSION "${project_version_safe}")
 set (CPACK_PACKAGE_VENDOR "Premysl Janouch")
-set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p.janouch@gmail.com>")
+set (CPACK_PACKAGE_CONTACT "Přemysl Janouch <p@janouch.name>")
 set (CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
 
 set (CPACK_GENERATOR "TGZ;ZIP")
diff --git a/LICENSE b/LICENSE
index 1d66b96..a069461 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,8 +1,7 @@
-Copyright (c) 2014 - 2017, Přemysl Janouch <p.janouch@gmail.com>
+Copyright (c) 2014 - 2018, Přemysl Janouch <p@janouch.name>
 
 Permission to use, copy, modify, and/or distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
+purpose with or without fee is hereby granted.
 
 THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/README.adoc b/README.adoc
index 8486ae8..82a4be3 100644
--- a/README.adoc
+++ b/README.adoc
@@ -179,13 +179,8 @@ Bitcoin donations: 12r5uEWEgcHC46xd64tt3hHt9EUvYYDHe9
 
 License
 -------
-'uirc3' is written by Přemysl Janouch <p.janouch@gmail.com>.
-
-You may use the software under the terms of the ISC license, the text of which
-is included within the package, or, at your option, you may relicense the work
-under the MIT or the Modified BSD License, as listed at the following site:
-
-http://www.gnu.org/licenses/license-list.html
+This software is released under the terms of the 0BSD license, the text of which
+is included within the package along with the list of authors.
 
 Note that 'degesch' technically becomes GPL-licensed when you statically link it
 against GNU Readline, but that is not a concern of this source package.
diff --git a/common.c b/common.c
index a735aeb..7f7cb9b 100644
--- a/common.c
+++ b/common.c
@@ -1,11 +1,10 @@
 /*
  * common.c: common functionality
  *
- * Copyright (c) 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2015, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/degesch.c b/degesch.c
index 21794f4..9511538 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1,11 +1,10 @@
 /*
  * degesch.c: the experimental IRC client
  *
- * Copyright (c) 2015 - 2018, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2015 - 2018, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/kike.c b/kike.c
index 33d80f4..7642a11 100644
--- a/kike.c
+++ b/kike.c
@@ -1,11 +1,10 @@
 /*
  * kike.c: the experimental IRC daemon
  *
- * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2016, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/auto-rejoin.lua b/plugins/degesch/auto-rejoin.lua
index 8abdb66..7de6c58 100644
--- a/plugins/degesch/auto-rejoin.lua
+++ b/plugins/degesch/auto-rejoin.lua
@@ -1,11 +1,10 @@
 --
 -- auto-rejoin.lua: join back automatically when someone kicks you
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/censor.lua b/plugins/degesch/censor.lua
index 3691c6d..0c30562 100644
--- a/plugins/degesch/censor.lua
+++ b/plugins/degesch/censor.lua
@@ -1,11 +1,10 @@
 --
 -- censor.lua: black out certain users' messages
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/fancy-prompt.lua b/plugins/degesch/fancy-prompt.lua
index 919c9e1..ef3a167 100644
--- a/plugins/degesch/fancy-prompt.lua
+++ b/plugins/degesch/fancy-prompt.lua
@@ -1,11 +1,10 @@
 --
 -- fancy-prompt.lua: the fancy multiline prompt you probably want
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/last-fm.lua b/plugins/degesch/last-fm.lua
index 8f6902d..e005456 100644
--- a/plugins/degesch/last-fm.lua
+++ b/plugins/degesch/last-fm.lua
@@ -5,11 +5,10 @@
 --
 -- I call this style closure-oriented programming
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/ping-timeout.lua b/plugins/degesch/ping-timeout.lua
index f871f42..f5f97e1 100644
--- a/plugins/degesch/ping-timeout.lua
+++ b/plugins/degesch/ping-timeout.lua
@@ -1,11 +1,10 @@
 --
 -- ping-timeout.lua: ping timeout readability enhancement plugin
 --
--- Copyright (c) 2015 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015 - 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/slack.lua b/plugins/degesch/slack.lua
index fb99b99..c2bb9ac 100644
--- a/plugins/degesch/slack.lua
+++ b/plugins/degesch/slack.lua
@@ -1,11 +1,10 @@
 --
 -- slack.lua: try to fix up UX when using the Slack IRC gateway
 --
--- Copyright (c) 2017, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2017, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/thin-cursor.lua b/plugins/degesch/thin-cursor.lua
index 13b5f5c..0b26ee8 100644
--- a/plugins/degesch/thin-cursor.lua
+++ b/plugins/degesch/thin-cursor.lua
@@ -1,11 +1,10 @@
 --
 -- thin-cursor.lua: set a thin cursor
 --
--- Copyright (c) 2016, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2016, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/degesch/utm-filter.lua b/plugins/degesch/utm-filter.lua
index 9c90684..7147093 100644
--- a/plugins/degesch/utm-filter.lua
+++ b/plugins/degesch/utm-filter.lua
@@ -1,11 +1,10 @@
 --
 -- utm-filter.lua: filter out Google Analytics bullshit from URLs
 --
--- Copyright (c) 2015, Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright (c) 2015, Přemysl Janouch <p@janouch.name>
 --
 -- Permission to use, copy, modify, and/or distribute this software for any
--- purpose with or without fee is hereby granted, provided that the above
--- copyright notice and this permission notice appear in all copies.
+-- purpose with or without fee is hereby granted.
 --
 -- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 -- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
diff --git a/plugins/zyklonb/factoids b/plugins/zyklonb/factoids
index 8bf2dc0..25b0875 100755
--- a/plugins/zyklonb/factoids
+++ b/plugins/zyklonb/factoids
@@ -2,7 +2,7 @@
 #
 # ZyklonB factoids plugin
 #
-# Copyright 2016 Přemysl Janouch <p.janouch@gmail.com>
+# Copyright 2016 Přemysl Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
 #
 
diff --git a/plugins/zyklonb/seen b/plugins/zyklonb/seen
index 3f49ea8..b965578 100755
--- a/plugins/zyklonb/seen
+++ b/plugins/zyklonb/seen
@@ -2,7 +2,7 @@
 --
 -- ZyklonB seen plugin
 --
--- Copyright 2016 Přemysl Janouch <p.janouch@gmail.com>
+-- Copyright 2016 Přemysl Janouch <p@janouch.name>
 -- See the file LICENSE for licensing information.
 --
 
diff --git a/plugins/zyklonb/youtube b/plugins/zyklonb/youtube
index 5614860..b0d013f 100755
--- a/plugins/zyklonb/youtube
+++ b/plugins/zyklonb/youtube
@@ -2,7 +2,7 @@
 #
 # ZyklonB YouTube plugin, displaying info about YouTube links
 #
-# Copyright 2014 - 2015, Přemysl Janouch <p.janouch@gmail.com>
+# Copyright 2014 - 2015, Přemysl Janouch <p@janouch.name>
 # See the file LICENSE for licensing information.
 #
 
diff --git a/zyklonb.c b/zyklonb.c
index 9a51d85..f5aa387 100644
--- a/zyklonb.c
+++ b/zyklonb.c
@@ -1,11 +1,10 @@
 /*
  * zyklonb.c: the experimental IRC bot
  *
- * Copyright (c) 2014 - 2016, Přemysl Janouch <p.janouch@gmail.com>
+ * Copyright (c) 2014 - 2016, Přemysl Janouch <p@janouch.name>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * purpose with or without fee is hereby granted.
  *
  * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
  * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF