diff --git a/UTscapy.py b/UTscapy.py
index 7c377ccb8bff9521d69e44e21ee6eaf4a9fa8684..f24a82c6b67e34be1d89cca88c06720f0f633b94 100755
--- a/UTscapy.py
+++ b/UTscapy.py
@@ -1,5 +1,26 @@
 #! /usr/bin/env python
 
+
+#############################################################################
+##                                                                         ##
+## UTscapy.py --- Unit Tests with scapy                                    ##
+##                see http://www.secdev.org/projects/UTscapy/              ##
+##                for more informations                                    ##
+##                                                                         ##
+## Copyright (C) 2005  Philippe Biondi <phil@secdev.org>                   ##
+##                                                                         ##
+## This program is free software; you can redistribute it and/or modify it ##
+## under the terms of the GNU General Public License version 2 as          ##
+## published by the Free Software Foundation.                              ##
+##                                                                         ##
+## This program is distributed in the hope that it will be useful, but     ##
+## WITHOUT ANY WARRANTY; without even the implied warranty of              ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU        ##
+## General Public License for more details.                                ##
+##                                                                         ##
+#############################################################################
+
+
 import sys
 from scapy.tools.UTscapy import main
 
diff --git a/scapy.py b/scapy.py
index 4eefb57eff0f7472ff82c98eb32e4371e7637bf7..39e36aab0db9d2b05dd585db9eee4d4a1163f1ff 100755
--- a/scapy.py
+++ b/scapy.py
@@ -1,5 +1,25 @@
 #! /usr/bin/env python
 
+#############################################################################
+##                                                                         ##
+## scapy.py --- Interactive packet manipulation tool                       ##
+##              see http://www.secdev.org/projects/scapy/                  ##
+##              for more informations                                      ##
+##                                                                         ##
+## Copyright (C) Philippe Biondi <phil@secdev.org>                         ##
+##                                                                         ##
+## This program is free software; you can redistribute it and/or modify it ##
+## under the terms of the GNU General Public License version 2 as          ##
+## published by the Free Software Foundation.                              ##
+##                                                                         ##
+## This program is distributed in the hope that it will be useful, but     ##
+## WITHOUT ANY WARRANTY; without even the implied warranty of              ##
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU       ##
+## General Public License for more details.                                ##
+##                                                                         ##
+#############################################################################
+
+
 from scapy.main import interact
 
 interact()
diff --git a/scapy/__init__.py b/scapy/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..881e0e302bc284d44d1e638209a9ed503bf07d6e 100644
--- a/scapy/__init__.py
+++ b/scapy/__init__.py
@@ -0,0 +1,4 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
diff --git a/scapy/all.py b/scapy/all.py
index 3119a189ac3d78600795a8a8ef45e9ec6421e90d..dd4f84b3ac1b3ce7adfe9ba9d07fcc23061fdf36 100644
--- a/scapy/all.py
+++ b/scapy/all.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 
 from base_classes import *
 from config import *
diff --git a/scapy/ansmachine.py b/scapy/ansmachine.py
index 1c4f0762658abb8069a3f22f87c80b84de1b6595..816a0205f19ac1b722b6c47f21ef4550f1e1263c 100644
--- a/scapy/ansmachine.py
+++ b/scapy/ansmachine.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 ########################
 ## Answering machines ##
 ########################
diff --git a/scapy/arch.py b/scapy/arch.py
index f3a1bcc039451d30239921f6dfa6a09329cc64e8..e9274ed7da5d5b4a626b5a8b17799a331cbaea30 100644
--- a/scapy/arch.py
+++ b/scapy/arch.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 
 import sys,os,struct,socket,time
 from fcntl import ioctl
diff --git a/scapy/as_resolvers.py b/scapy/as_resolvers.py
index 05392c8d61e20ad5deca0325921b11e36a5f627e..d8abc28385700d55bb4b33556869a9a4dad8e7e6 100644
--- a/scapy/as_resolvers.py
+++ b/scapy/as_resolvers.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from config import conf
 
 class AS_resolver:
diff --git a/scapy/asn1/__init__.py b/scapy/asn1/__init__.py
index 095a1d516a1fb18c6dd48d96e966e6c9fbcc431c..a02c899908b29344a70236d1d40aa80fb7377b90 100644
--- a/scapy/asn1/__init__.py
+++ b/scapy/asn1/__init__.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 # We do not import mib.py because it is more bound to scapy and
 # less prone to be used in a standalone fashion
 __all__ = ["asn1","ber"]
diff --git a/scapy/asn1/asn1.py b/scapy/asn1/asn1.py
index aba86f12061579e961bb1cbddaefb5c54a79c379..0df885ad911c921e36457682b245cbba73d51d13 100644
--- a/scapy/asn1/asn1.py
+++ b/scapy/asn1/asn1.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import random
 from scapy.config import conf
 from scapy.error import Scapy_Exception,warning
diff --git a/scapy/asn1/ber.py b/scapy/asn1/ber.py
index abe99cd34c40c2838ab61d3ebb52f5abc16ff869..a74aa6c94b0ee7963159c7ebabfda09d5018dd7f 100644
--- a/scapy/asn1/ber.py
+++ b/scapy/asn1/ber.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.error import warning
 from asn1 import ASN1_Decoding_Error,ASN1_BadTag_Decoding_Error,ASN1_Codecs,ASN1_Class_UNIVERSAL,ASN1_Error,ASN1_DECODING_ERROR,ASN1_BADTAG
 
diff --git a/scapy/asn1/mib.py b/scapy/asn1/mib.py
index f815a35d3575da73ca521dcbe4fe72821f8bec4b..b3da5a340f8b3f53fc21551f3a406297b9a88ba3 100644
--- a/scapy/asn1/mib.py
+++ b/scapy/asn1/mib.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import re
 from glob import glob
 from scapy.dadict import DADict,fixname
diff --git a/scapy/asn1fields.py b/scapy/asn1fields.py
index 69de760d506613a58ec6ae3db743186a739e503f..3f564cbd91f414ff754d854ded0b36f04e9189f3 100644
--- a/scapy/asn1fields.py
+++ b/scapy/asn1fields.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from asn1.asn1 import *
 from asn1.ber import *
 from volatile import *
diff --git a/scapy/asn1packet.py b/scapy/asn1packet.py
index e8ce01f3ed676ec728cade123e9a38e442c26dea..dc900b0a2f99ca7a3d51c1ae3010bbc2d163b52b 100644
--- a/scapy/asn1packet.py
+++ b/scapy/asn1packet.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from packet import *
 
 class ASN1_Packet(Packet):
diff --git a/scapy/automaton.py b/scapy/automaton.py
index 2c99213fbcecb114d4a3fcfcc8c33b35844a0385..b5be2b1430919ee2c71dd7714e124cc31ba530e6 100644
--- a/scapy/automaton.py
+++ b/scapy/automaton.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import types,itertools,time
 from select import select
 from config import conf
diff --git a/scapy/autorun.py b/scapy/autorun.py
index 34cb248a554f1e04318867c275d36f36f213214f..be766c5ce5dd3aee35854ee44a0a11a85eb90d5f 100644
--- a/scapy/autorun.py
+++ b/scapy/autorun.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import code,sys
 from config import conf
 from themes import *
diff --git a/scapy/base_classes.py b/scapy/base_classes.py
index 30f91738987c0d4b30a879d30138293eb1b2ba0b..1a77642e9e040460614071853ce18ef1653ccf08 100644
--- a/scapy/base_classes.py
+++ b/scapy/base_classes.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 ###############
 ## Generators ##
 ################
diff --git a/scapy/config.py b/scapy/config.py
index e3e17fc56703c78028c649d89880d0753b10cf71..8b40d050309f19478e51fe3454c74247f63fba1c 100644
--- a/scapy/config.py
+++ b/scapy/config.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os,time
 from data import *
 import base_classes
diff --git a/scapy/dadict.py b/scapy/dadict.py
index ea637e46e137f1fc2d3c3190dc7e3cd3b9289d11..0ba66a6e40f1bb1c601da85e386abb2d59e78482 100644
--- a/scapy/dadict.py
+++ b/scapy/dadict.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from error import Scapy_Exception
 
 ###############################
diff --git a/scapy/data.py b/scapy/data.py
index d3f8f92d7b55e59d6a8f790c7dbd427378cf930f..9f19fcacfbe063cec8e31c0ed4c510e5beaedb93 100644
--- a/scapy/data.py
+++ b/scapy/data.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import re
 from dadict import DADict
 from error import log_loading
diff --git a/scapy/error.py b/scapy/error.py
index 0dfcc74a5f01b5c4fd2852c62f308b264b580c96..b97c8a9453bdf4b8b18ca9d44acd39753f3067b5 100644
--- a/scapy/error.py
+++ b/scapy/error.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 
 #############################
 ##### Logging subsystem #####
diff --git a/scapy/fields.py b/scapy/fields.py
index 4e771da13184df3b9ecddff9c0dcc86461072089..9e29b9bd07f13f96fc094c9586cf445e57d93098 100644
--- a/scapy/fields.py
+++ b/scapy/fields.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct,copy,socket
 from config import conf
 from volatile import *
diff --git a/scapy/layers/__init__.py b/scapy/layers/__init__.py
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..881e0e302bc284d44d1e638209a9ed503bf07d6e 100644
--- a/scapy/layers/__init__.py
+++ b/scapy/layers/__init__.py
@@ -0,0 +1,4 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
diff --git a/scapy/layers/all.py b/scapy/layers/all.py
index 1287a1232115cd2c2cc9b45955c4edf2273dcc40..0887be49301fcfa5316de28a5386fbeb3c3d35e5 100644
--- a/scapy/layers/all.py
+++ b/scapy/layers/all.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from l2 import *
 from inet import *
 from dhcp import *
diff --git a/scapy/layers/bluetooth.py b/scapy/layers/bluetooth.py
index 9dd60deda1f7d306fee771bed7d75d90e090a6b2..d48e292939cd465b1a650df0a06283b67f7b67ef 100644
--- a/scapy/layers/bluetooth.py
+++ b/scapy/layers/bluetooth.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import socket,struct
 
 from scapy.config import conf
diff --git a/scapy/layers/dhcp.py b/scapy/layers/dhcp.py
index d414e149b877f5bd6c61819890846e118a49b394..c6852626e355bc78efbbaba8342d94cda8a9d1ae 100644
--- a/scapy/layers/dhcp.py
+++ b/scapy/layers/dhcp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct
 
 from scapy.packet import *
diff --git a/scapy/layers/dns.py b/scapy/layers/dns.py
index c880700e3a42ebba3095d5a412433569f2392375..1ca3df0b3ef0ec8e76fbb9da1e0bc03dc6c357f3 100644
--- a/scapy/layers/dns.py
+++ b/scapy/layers/dns.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import socket,struct
 
 from scapy.packet import *
diff --git a/scapy/layers/dot11.py b/scapy/layers/dot11.py
index 15d536657f56b808c47b1f966c0c7926c8abcdd7..3382940446b1a751838f46f32365c0d3720a088a 100644
--- a/scapy/layers/dot11.py
+++ b/scapy/layers/dot11.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import re,struct
 
 from scapy.packet import *
diff --git a/scapy/layers/gprs.py b/scapy/layers/gprs.py
index d1fbbfcf7daf90ca36fa9107bb3e533ee84359e3..fa944d8ad78a75aadfde0c31e0e4770e716979c7 100644
--- a/scapy/layers/gprs.py
+++ b/scapy/layers/gprs.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 
 from scapy.fields import *
 from scapy.packet import *
diff --git a/scapy/layers/hsrp.py b/scapy/layers/hsrp.py
index 8af7b963cfde8608840b4464166c06b31bfbb630..2e7e4a42fe12903ebcb7e9f6faed2fe01859e6ef 100644
--- a/scapy/layers/hsrp.py
+++ b/scapy/layers/hsrp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.fields import *
 from scapy.packet import *
 from scapy.layers.inet import UDP
diff --git a/scapy/layers/inet.py b/scapy/layers/inet.py
index d5f1b97791b7bceb243a4d8bca3803acf993ec7f..e575cc1e0c023b93b07b2a23faf82b0513ca9314 100644
--- a/scapy/layers/inet.py
+++ b/scapy/layers/inet.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os,time,struct,re,socket,new
 from select import select
 
diff --git a/scapy/layers/ip6.py b/scapy/layers/ip6.py
index 9dd938cc2b5a42bf69f20bd778a087b460d0f566..b789f387509eb91664885a0566418733db91ce99 100644
--- a/scapy/layers/ip6.py
+++ b/scapy/layers/ip6.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.error import log_interactive
 from scapy.packet import *
 from scapy.fields import *
diff --git a/scapy/layers/ir.py b/scapy/layers/ir.py
index e0e47e4b8a2b4574477c01cbe40f0eaa3e0506b2..daf49a63dcee041b153b88d821947acf7d84a271 100644
--- a/scapy/layers/ir.py
+++ b/scapy/layers/ir.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 from scapy.layers.l2 import CookedLinux
diff --git a/scapy/layers/isakmp.py b/scapy/layers/isakmp.py
index b7aafc82a3cdd365755eccead0bbfe772afb7329..8dd60ad8c069cad0a25764cb9c4fe19f05337473 100644
--- a/scapy/layers/isakmp.py
+++ b/scapy/layers/isakmp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct
 from scapy.packet import *
 from scapy.fields import *
diff --git a/scapy/layers/l2.py b/scapy/layers/l2.py
index 64730b46457d66e38a853afead7efc524ddcc99f..097efa66795506dc1cd06818d8bed6b8ebbb8fe8 100644
--- a/scapy/layers/l2.py
+++ b/scapy/layers/l2.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os,struct,time
 from scapy.config import conf
 from scapy.packet import *
diff --git a/scapy/layers/l2tp.py b/scapy/layers/l2tp.py
index b5d001a8bf99945b41cbfd673570f72c8931f264..62c39f4af1b373389d7a0008cc8affa6eda3ec05 100644
--- a/scapy/layers/l2tp.py
+++ b/scapy/layers/l2tp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct
 
 from scapy.packet import *
diff --git a/scapy/layers/mgcp.py b/scapy/layers/mgcp.py
index fec4dbf52e48dc15c1f271f2a12c9732eac6797c..aee14cabdd9d194e5f788879bcc6ec5a621d7619 100644
--- a/scapy/layers/mgcp.py
+++ b/scapy/layers/mgcp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 from scapy.layers.inet import UDP
diff --git a/scapy/layers/mobileip.py b/scapy/layers/mobileip.py
index 3eb7d8e359d952c70a6fc8e4a9f2c97d2b07cbac..6808824df1fce3e763f56364a4216104fb077599 100644
--- a/scapy/layers/mobileip.py
+++ b/scapy/layers/mobileip.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.fields import *
 from scapy.packet import *
 from scapy.layers.inet import IP,UDP
diff --git a/scapy/layers/netbios.py b/scapy/layers/netbios.py
index 098c965f4f55e00782cbefac14b296a41af0b803..bb0d15868a35008b239eb7aa702b38ec244fe97c 100644
--- a/scapy/layers/netbios.py
+++ b/scapy/layers/netbios.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct
 from scapy.packet import *
 from scapy.fields import *
diff --git a/scapy/layers/netflow.py b/scapy/layers/netflow.py
index 9047ca535900b3aff485d11306acba1d42b6ab4b..02addee51b691a4b5631f821ee7aa8c0c92c79a9 100644
--- a/scapy/layers/netflow.py
+++ b/scapy/layers/netflow.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.fields import *
 from scapy.packet import *
 
diff --git a/scapy/layers/ntp.py b/scapy/layers/ntp.py
index 5f07bb9f9ac105e60360c92b0028ab0ea7430d5d..bd1434836bef0f9eda87c7fb67ac963055735152 100644
--- a/scapy/layers/ntp.py
+++ b/scapy/layers/ntp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 from scapy.layers.inet import UDP
diff --git a/scapy/layers/ppp.py b/scapy/layers/ppp.py
index cec4e18db2db95a35b11b30651e78b4ff9b8a437..06062a9d6a426f7df46ef2a7d7fc621fe582fffa 100644
--- a/scapy/layers/ppp.py
+++ b/scapy/layers/ppp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct
 from scapy.packet import *
 from scapy.layers.l2 import *
diff --git a/scapy/layers/radius.py b/scapy/layers/radius.py
index 13946b9a85a675a9f99b96c4932aeb84d4f06839..e3661e013fa473b975e6a8c66025291d7f6230d7 100644
--- a/scapy/layers/radius.py
+++ b/scapy/layers/radius.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import struct
 from scapy.packet import *
 from scapy.fields import *
diff --git a/scapy/layers/rip.py b/scapy/layers/rip.py
index f41b611cc29a62079f2c6c896042355f3d7842ab..b3a9abf6350e12d1a70e4ad6be7c00e912493ef3 100644
--- a/scapy/layers/rip.py
+++ b/scapy/layers/rip.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 from scapy.layers.inet import UDP
diff --git a/scapy/layers/rtp.py b/scapy/layers/rtp.py
index f926f2aa5da0dc9ca6c66be7d2edf03031162884..83116f4b8e5c3443f5e9649ed148e53a354453ad 100644
--- a/scapy/layers/rtp.py
+++ b/scapy/layers/rtp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 
diff --git a/scapy/layers/sebek.py b/scapy/layers/sebek.py
index 2028595e82dc990eb6ac9741b32c9aa09460fd14..2459ae87acf13899fb6f2b1683821868cb5ead5a 100644
--- a/scapy/layers/sebek.py
+++ b/scapy/layers/sebek.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.fields import *
 from scapy.packet import *
 from scapy.layers.inet import UDP
diff --git a/scapy/layers/skinny.py b/scapy/layers/skinny.py
index d8eb918ffcec18246c60b9ca4293dce04c9f15d8..827c6bc332d4baa13616fd8b1c4d108fc23db32c 100644
--- a/scapy/layers/skinny.py
+++ b/scapy/layers/skinny.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 from scapy.layers.inet import TCP
diff --git a/scapy/layers/smb.py b/scapy/layers/smb.py
index d999c360bb13e6d6e0769cc59484759404a42d6d..b851f51bcbddda01f5246d49e459623e0fa386be 100644
--- a/scapy/layers/smb.py
+++ b/scapy/layers/smb.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.packet import *
 from scapy.fields import *
 from scapy.layers.netbios import NBTSession
diff --git a/scapy/layers/snmp.py b/scapy/layers/snmp.py
index 58559cd5d278b32d7861e6396d81f8b3df81645f..a3474472361b5b8719423ead52134a8f6fff355a 100644
--- a/scapy/layers/snmp.py
+++ b/scapy/layers/snmp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.asn1packet import *
 from scapy.asn1fields import *
 from scapy.layers.inet import UDP
diff --git a/scapy/layers/tftp.py b/scapy/layers/tftp.py
index 5b3c879916dc97f52e534e281135793afbd80c16..28c569eddec4e2519715fcfc06d0016574081d6a 100644
--- a/scapy/layers/tftp.py
+++ b/scapy/layers/tftp.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os,random
 from scapy.packet import *
 from scapy.fields import *
diff --git a/scapy/layers/x509.py b/scapy/layers/x509.py
index 4c3e8182d9e4d2d60f05e83fc6cab83f45182b45..f8388d1d4f4ebe8e9b93ae013407bede00add393 100644
--- a/scapy/layers/x509.py
+++ b/scapy/layers/x509.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.asn1packet import *
 from scapy.asn1fields import *
 
diff --git a/scapy/main.py b/scapy/main.py
index ca30a04b96a47051ece2b10d8885efc1098fbd71..bf2b504ee66c05c88f2dc887dae168723afb9503 100644
--- a/scapy/main.py
+++ b/scapy/main.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 
 from __future__ import generators
 import os,sys
diff --git a/scapy/modules/__init__.py b/scapy/modules/__init__.py
index 792d6005489ebee62cde02066f19c5521e620451..881e0e302bc284d44d1e638209a9ed503bf07d6e 100644
--- a/scapy/modules/__init__.py
+++ b/scapy/modules/__init__.py
@@ -1 +1,4 @@
-#
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
diff --git a/scapy/modules/geoip.py b/scapy/modules/geoip.py
index 01c06061d128a1194472a2a70c172139bac8d280..b3ca97d4c40cdfe4ac854247858411706da6260a 100644
--- a/scapy/modules/geoip.py
+++ b/scapy/modules/geoip.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.data import KnowledgeBase
 from scapy.config import conf
 
diff --git a/scapy/modules/nmap.py b/scapy/modules/nmap.py
index ee3e0735edfc07b38eda1f8c2142f143e2c6ebbd..211463e443b5e03e15f690b9ba50d2251ad22de0 100644
--- a/scapy/modules/nmap.py
+++ b/scapy/modules/nmap.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.data import KnowledgeBase
 from scapy.config import conf
 
diff --git a/scapy/modules/p0f.py b/scapy/modules/p0f.py
index 731c06336fae62a559060588cfe63c8cbb96243b..eb7aea04e945004470f2ee1f49d885b22d4f5129 100644
--- a/scapy/modules/p0f.py
+++ b/scapy/modules/p0f.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.data import KnowledgeBase
 from scapy.config import conf
 
diff --git a/scapy/modules/queso.py b/scapy/modules/queso.py
index db85b7aef953c55fa4ada77568fd2ce327d1dc86..bb3f8854913be45795ce6a83bc21ae34ca614115 100644
--- a/scapy/modules/queso.py
+++ b/scapy/modules/queso.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 from scapy.data import KnowledgeBase
 from scapy.config import conf
 from scapy.layers.inet import IP,TCP
diff --git a/scapy/modules/voip.py b/scapy/modules/voip.py
index f2a0835197d3d8172f240f7166091ad2f10c957d..4f41763d8962660e173c2607f8e68e668d928f9b 100644
--- a/scapy/modules/voip.py
+++ b/scapy/modules/voip.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os
 ###################
 ## Testing stuff ##
diff --git a/scapy/packet.py b/scapy/packet.py
index 61ba3301f77a01f3064a52c7910ad52602980122..6c86a1b4a078e487b1e97dd93ae21c2e4ef0acd1 100644
--- a/scapy/packet.py
+++ b/scapy/packet.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import re,time,itertools,os,random,socket
 from fields import StrField,ConditionalField,Emph
 from config import conf
diff --git a/scapy/plist.py b/scapy/plist.py
index a6f91fbe6b99e5624a447d87aeb0ac2d2afaf36c..845076c55ddfd4dcd3bb3a0ca54726e04a83db5e 100644
--- a/scapy/plist.py
+++ b/scapy/plist.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os,socket
 from config import conf
 from error import warning
diff --git a/scapy/route.py b/scapy/route.py
index 6fb52018afd3034de0a4282d43037e2e0754da55..0ebf37656e6a7ee8f2f98f40a05afa63df1b1d61 100644
--- a/scapy/route.py
+++ b/scapy/route.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import socket
 from arch import read_routes,get_if_addr,LOOPBACK_NAME
 from utils import atol,ltoa,itom
diff --git a/scapy/sendrecv.py b/scapy/sendrecv.py
index 02bf3858d1a44b1f2f97b6795573fccfa2b19ac6..3e34010a659b965c95fa5dd2f26bc73af2a8b99c 100644
--- a/scapy/sendrecv.py
+++ b/scapy/sendrecv.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import cPickle,os,sys,time
 from select import select
 from data import *
diff --git a/scapy/supersocket.py b/scapy/supersocket.py
index 4d33cc7971cd5e4eac1e3b92c193b1ff86d37a30..7f25db8d2680c55e3ce4fb3d2e29d7400cf5cb56 100644
--- a/scapy/supersocket.py
+++ b/scapy/supersocket.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import socket,time,os,struct
 from select import select
 from packet import Raw
diff --git a/scapy/themes.py b/scapy/themes.py
index 2dc6a860f758374760b1ffe26067aec9421f61e4..8b43647c2e55d54d948cbcf1df8aca2c6fbe2744 100644
--- a/scapy/themes.py
+++ b/scapy/themes.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import config
 
 ##################
diff --git a/scapy/tools/UTscapy.py b/scapy/tools/UTscapy.py
index b9c4d4996cdfdbdcb592a62198ed77dcda72b99f..acda8a8a0dd58194e8cdcc55994fe2cba0d6b0e4 100755
--- a/scapy/tools/UTscapy.py
+++ b/scapy/tools/UTscapy.py
@@ -1,26 +1,8 @@
-#! /usr/bin/env python
-
-#############################################################################
-##                                                                         ##
-## UTscapy.py --- Unit Tests with scapy                                    ##
-##                see http://www.secdev.org/projects/UTscapy/              ##
-##                for more informations                                    ##
-##                                                                         ##
-## Copyright (C) 2005  Philippe Biondi <phil@secdev.org>                   ##
-##                                                                         ##
-## This program is free software; you can redistribute it and/or modify it ##
-## under the terms of the GNU General Public License version 2 as          ##
-## published by the Free Software Foundation.                              ##
-##                                                                         ##
-## This program is distributed in the hope that it will be useful, but     ##
-## WITHOUT ANY WARRANTY; without even the implied warranty of              ##
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU        ##
-## General Public License for more details.                                ##
-##                                                                         ##
-#############################################################################
-
-
-# $Id: UTscapy.py,v 1.25 2007/01/28 11:55:03 pbi Exp $
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 
 import sys,getopt,imp
 import bz2, base64, os, os.path, time, imp, traceback, zlib, sha
diff --git a/scapy/tools/__init__.py b/scapy/tools/__init__.py
index 792d6005489ebee62cde02066f19c5521e620451..881e0e302bc284d44d1e638209a9ed503bf07d6e 100644
--- a/scapy/tools/__init__.py
+++ b/scapy/tools/__init__.py
@@ -1 +1,4 @@
-#
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
diff --git a/scapy/utils.py b/scapy/utils.py
index 562608d1379bdd7ce1e52688090278671e5a9346..bf3dab787a12f37dcd7d615b39e7cde09b74ef46 100644
--- a/scapy/utils.py
+++ b/scapy/utils.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import os,sys,socket,types
 from config import conf
 import random
diff --git a/scapy/volatile.py b/scapy/volatile.py
index 86ab51999713901596cb180feed9d9a024849ba8..ccfd4536a9a5d53e4c8962acc4d0e3d7267f7623 100644
--- a/scapy/volatile.py
+++ b/scapy/volatile.py
@@ -1,3 +1,8 @@
+## This file is part of Scapy
+## See http://www.secdev.org/projects/scapy for more informations
+## Copyright (C) Philippe Biondi <phil@secdev.org>
+## This program is published under a GPLv2 license
+
 import random,time
 from base_classes import Net
 from utils import corrupt_bits,corrupt_bytes