diff --git a/core/actions.lua b/core/actions.lua
index d0be5aeb5..5c2525e00 100644
--- a/core/actions.lua
+++ b/core/actions.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local actions = {};
 
diff --git a/core/eventmanager.lua b/core/eventmanager.lua
index 04f2256f9..e1cc9d2e8 100644
--- a/core/eventmanager.lua
+++ b/core/eventmanager.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local t_insert = table.insert;
 local ipairs = ipairs;
diff --git a/core/hostmanager.lua b/core/hostmanager.lua
index 0dd2c9d87..c7b975d1f 100644
--- a/core/hostmanager.lua
+++ b/core/hostmanager.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local hosts = hosts;
 local configmanager = require "core.configmanager";
diff --git a/core/loggingmanager.lua b/core/loggingmanager.lua
index 2be21a177..1d2f8d7df 100644
--- a/core/loggingmanager.lua
+++ b/core/loggingmanager.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local format, rep = string.format, string.rep;
 local pcall = pcall;
diff --git a/core/objectmanager.lua b/core/objectmanager.lua
index b8e5eb3f4..e96cbd90a 100644
--- a/core/objectmanager.lua
+++ b/core/objectmanager.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local new_multitable = require "util.multitable".new;
 local t_insert = table.insert;
diff --git a/fallbacks/bit.lua b/fallbacks/bit.lua
index 86e3b4a48..75109d404 100644
--- a/fallbacks/bit.lua
+++ b/fallbacks/bit.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local type = type;
 local tonumber = tonumber;
diff --git a/net/adns.lua b/net/adns.lua
index e219ffa7f..34ef5d770 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local server = require "net.server";
 local dns = require "net.dns";
 
diff --git a/net/http.lua b/net/http.lua
index 10d966310..9d2f9b968 100644
--- a/net/http.lua
+++ b/net/http.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local socket = require "socket"
 local mime = require "mime"
diff --git a/net/httpclient_listener.lua b/net/httpclient_listener.lua
index a648743fb..69b7946b9 100644
--- a/net/httpclient_listener.lua
+++ b/net/httpclient_listener.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local log = require "util.logger".init("httpclient_listener");
 
 local connlisteners_register = require "net.connlisteners".register;
diff --git a/net/httpserver.lua b/net/httpserver.lua
index 8ce25f356..d159202ef 100644
--- a/net/httpserver.lua
+++ b/net/httpserver.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local socket = require "socket"
 local server = require "net.server"
diff --git a/net/httpserver_listener.lua b/net/httpserver_listener.lua
index f7fb7f4e3..48ade157e 100644
--- a/net/httpserver_listener.lua
+++ b/net/httpserver_listener.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 
 local connlisteners_register = require "net.connlisteners".register;
diff --git a/net/server.lua b/net/server.lua
index 3491b190e..ca6e6380f 100644
--- a/net/server.lua
+++ b/net/server.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 --[[
 
         server.lua by blastbeat
diff --git a/plugins/mod_actions_http.lua b/plugins/mod_actions_http.lua
index 43370a418..c60697938 100644
--- a/plugins/mod_actions_http.lua
+++ b/plugins/mod_actions_http.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local httpserver = require "net.httpserver";
 local t_concat, t_insert = table.concat, table.insert;
diff --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua
index 010b45d9e..118ba13d3 100644
--- a/plugins/mod_announce.lua
+++ b/plugins/mod_announce.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local st, jid, set = require "util.stanza", require "util.jid", require "util.set";
 
 local is_admin = require "core.usermanager".is_admin;
diff --git a/plugins/mod_bosh.lua b/plugins/mod_bosh.lua
index 46e9a95f6..b07238bd6 100644
--- a/plugins/mod_bosh.lua
+++ b/plugins/mod_bosh.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 module.host = "*" -- Global module
 
diff --git a/plugins/mod_groups.lua b/plugins/mod_groups.lua
index 7a5817174..f31bb1a88 100644
--- a/plugins/mod_groups.lua
+++ b/plugins/mod_groups.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local groups = { default = {} };
 local members = { [false] = {} };
diff --git a/plugins/mod_httpserver.lua b/plugins/mod_httpserver.lua
index ec22a4bf9..98a3a36ea 100644
--- a/plugins/mod_httpserver.lua
+++ b/plugins/mod_httpserver.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local httpserver = require "net.httpserver";
 
diff --git a/plugins/mod_iq.lua b/plugins/mod_iq.lua
index 30afb38c8..5be045335 100644
--- a/plugins/mod_iq.lua
+++ b/plugins/mod_iq.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local st = require "util.stanza";
 local jid_split = require "util.jid".split;
diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index b56aef0a8..395307ba5 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local full_sessions = full_sessions;
 local bare_sessions = bare_sessions;
diff --git a/plugins/mod_muc.lua b/plugins/mod_muc.lua
index 4f695b179..e99ef83c0 100644
--- a/plugins/mod_muc.lua
+++ b/plugins/mod_muc.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 if module:get_host_type() ~= "component" then
 	error("MUC should be loaded as a component, please see http://prosody.im/doc/components", 0);
diff --git a/plugins/mod_offline.lua b/plugins/mod_offline.lua
index 4fb82cc0d..c9acf9e6a 100644
--- a/plugins/mod_offline.lua
+++ b/plugins/mod_offline.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local datamanager = require "util.datamanager";
 local st = require "util.stanza";
diff --git a/plugins/mod_pep.lua b/plugins/mod_pep.lua
index 0be681fbc..8cc4aedfb 100644
--- a/plugins/mod_pep.lua
+++ b/plugins/mod_pep.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local jid_bare = require "util.jid".bare;
 local jid_split = require "util.jid".split;
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index a97b7f1be..c00482c52 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local want_pposix_version = "0.3.0";
 
diff --git a/plugins/mod_privacy.lua b/plugins/mod_privacy.lua
index 9f8a149bd..8c319bdec 100644
--- a/plugins/mod_privacy.lua
+++ b/plugins/mod_privacy.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local st = require "util.stanza";
 local datamanager = require "util.datamanager";
diff --git a/plugins/mod_watchregistrations.lua b/plugins/mod_watchregistrations.lua
index 93e69208d..9457313f6 100644
--- a/plugins/mod_watchregistrations.lua
+++ b/plugins/mod_watchregistrations.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local host = module:get_host();
 
diff --git a/tests/test_util_stanza.lua b/tests/test_util_stanza.lua
index f4c4810a5..0819f2c75 100644
--- a/tests/test_util_stanza.lua
+++ b/tests/test_util_stanza.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 function preserialize(preserialize, st)
 	local stanza = st.stanza("message", { a = "a" });
diff --git a/tests/util/logger.lua b/tests/util/logger.lua
index ce0a23026..003c5946a 100644
--- a/tests/util/logger.lua
+++ b/tests/util/logger.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local format = string.format;
 local print = print;
 local debug = debug;
diff --git a/util/array.lua b/util/array.lua
index 05e035dfb..ce5ce0774 100644
--- a/util/array.lua
+++ b/util/array.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local array = {};
 
 local array_mt = { __index = array, __tostring = function (array) return array:concat(", "); end };
diff --git a/util/dataforms.lua b/util/dataforms.lua
index 1a6807d81..ed62f9b18 100644
--- a/util/dataforms.lua
+++ b/util/dataforms.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local setmetatable = setmetatable;
 local pairs, ipairs = pairs, ipairs;
 local tostring, type = tostring, type;
diff --git a/util/events.lua b/util/events.lua
index 1d07fe099..a1edd496b 100644
--- a/util/events.lua
+++ b/util/events.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local ipairs = ipairs;
 local pairs = pairs;
diff --git a/util/hmac.lua b/util/hmac.lua
index d3163bb3f..ffd69d91e 100644
--- a/util/hmac.lua
+++ b/util/hmac.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local hashes = require "util.hashes"
 local xor = require "bit".bxor
 
diff --git a/util/iterators.lua b/util/iterators.lua
index 7c9b5269e..08bb729c6 100644
--- a/util/iterators.lua
+++ b/util/iterators.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 --[[ Iterators ]]--
 
 -- Reverse an iterator
diff --git a/util/pluginloader.lua b/util/pluginloader.lua
index 861fe6a9f..696af34f2 100644
--- a/util/pluginloader.lua
+++ b/util/pluginloader.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local plugin_dir = CFG_PLUGINDIR or "./plugins/";
 
diff --git a/util/prosodyctl.lua b/util/prosodyctl.lua
index 2213e2d71..b24e194da 100644
--- a/util/prosodyctl.lua
+++ b/util/prosodyctl.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local config = require "core.configmanager";
 local encodings = require "util.encodings";
diff --git a/util/pubsub.lua b/util/pubsub.lua
index 9cb5c7ec1..8f6af2fdd 100644
--- a/util/pubsub.lua
+++ b/util/pubsub.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 
 local ipairs, pairs, setmetatable, type = 
         ipairs, pairs, setmetatable, type;
diff --git a/util/set.lua b/util/set.lua
index 84bfe8c42..5f7a9ae24 100644
--- a/util/set.lua
+++ b/util/set.lua
@@ -1,3 +1,11 @@
+-- Prosody IM
+-- Copyright (C) 2008-2009 Matthew Wild
+-- Copyright (C) 2008-2009 Waqas Hussain
+-- 
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
+--
+
 local ipairs, pairs, setmetatable, next, tostring = 
       ipairs, pairs, setmetatable, next, tostring;
 local t_concat = table.concat;