diff --git a/doc/FAQ.html b/doc/FAQ.html
new file mode 100644
index 000000000..93a3ed208
--- /dev/null
+++ b/doc/FAQ.html
@@ -0,0 +1,246 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<HTML>
+<HEAD>
+ <META NAME="GENERATOR" CONTENT="LinuxDoc-Tools 0.9.66">
+ <TITLE>sqlmap - Frequently Asked Questions</TITLE>
+</HEAD>
+<BODY>
+<H1>sqlmap - Frequently Asked Questions</H1>
+
+<H2>by 
+<A HREF="mailto:bernardo.damele@gmail.com">Bernardo Damele A. G.</A>,
+<A HREF="mailto:miroslav.stampar@gmail.com">Miroslav Stampar</A></H2>
+<HR>
+<EM>This document contains frequently asked questions for 
+<A HREF="http://www.sqlmap.org">sqlmap</A>.</EM>
+<HR>
+<P>
+<H2><A NAME="toc1">1.</A> <A HREF="FAQ.html#s1">Frequently Asked Questions</A></H2>
+
+<UL>
+<LI><A NAME="toc1.1">1.1</A> <A HREF="FAQ.html#ss1.1">What is sqlmap?</A>
+<LI><A NAME="toc1.2">1.2</A> <A HREF="FAQ.html#ss1.2">How do I execute sqlmap?</A>
+<LI><A NAME="toc1.3">1.3</A> <A HREF="FAQ.html#ss1.3">Can I integrate sqlmap with a security tool I am developing?</A>
+<LI><A NAME="toc1.4">1.4</A> <A HREF="FAQ.html#ss1.4">How can I integrate sqlmap with my own tool?</A>
+<LI><A NAME="toc1.5">1.5</A> <A HREF="FAQ.html#ss1.5">Will you support other database management systems?</A>
+<LI><A NAME="toc1.6">1.6</A> <A HREF="FAQ.html#ss1.6">How can I occasionally contribute?</A>
+<LI><A NAME="toc1.7">1.7</A> <A HREF="FAQ.html#ss1.7">Can I actively contribute in the long-term development?</A>
+<LI><A NAME="toc1.8">1.8</A> <A HREF="FAQ.html#ss1.8">How can I support the development?</A>
+<LI><A NAME="toc1.9">1.9</A> <A HREF="FAQ.html#ss1.9">Can you hack a site for me?</A>
+<LI><A NAME="toc1.10">1.10</A> <A HREF="FAQ.html#ss1.10">When sqlmap will switch to the Python 3?</A>
+<LI><A NAME="toc1.11">1.11</A> <A HREF="FAQ.html#ss1.11">What does <CODE>"WARNING unknown charset '...'"</CODE> mean?</A>
+<LI><A NAME="toc1.12">1.12</A> <A HREF="FAQ.html#ss1.12">How to use sqlmap with <CODE>mod_rewrite</CODE> enabled?</A>
+<LI><A NAME="toc1.13">1.13</A> <A HREF="FAQ.html#ss1.13">Why is sqlmap not able to get password hashes in some cases?</A>
+<LI><A NAME="toc1.14">1.14</A> <A HREF="FAQ.html#ss1.14">What is <CODE>-</CODE><CODE>-text-only</CODE> switch?</A>
+<LI><A NAME="toc1.15">1.15</A> <A HREF="FAQ.html#ss1.15">sqlmap is retrieving weird characters for even simplest data (e.g. <CODE>--banner</CODE>)?</A>
+<LI><A NAME="toc1.16">1.16</A> <A HREF="FAQ.html#ss1.16">I am getting <CODE>"CRITICAL connection timed"</CODE> while I am able to browse the site normally?</A>
+<LI><A NAME="toc1.17">1.17</A> <A HREF="FAQ.html#ss1.17">Is it possible to use <CODE>"INSERT/UPDATE"</CODE> SQL commands via <CODE>-</CODE><CODE>-sql-query</CODE></A>
+<LI><A NAME="toc1.18">1.18</A> <A HREF="FAQ.html#ss1.18">I am getting <CODE>"finally: SyntaxError: invalid syntax"</CODE> when trying to run sqlmap?</A>
+<LI><A NAME="toc1.19">1.19</A> <A HREF="FAQ.html#ss1.19">sqlmap is not able to detect/exploit injection while other commercial tools are?</A>
+</UL>
+
+<HR>
+<H2><A NAME="s1">1.</A> <A HREF="#toc1">Frequently Asked Questions</A></H2>
+
+<H2><A NAME="ss1.1">1.1</A> <A HREF="#toc1.1">What is sqlmap?</A>
+</H2>
+
+<P>sqlmap is an open source penetration testing tool that automates the
+process of detecting and exploiting SQL injection flaws and taking over
+of database servers. It comes with a powerful detection engine, many niche
+features for the ultimate penetration tester and a broad range of switches
+lasting from database fingerprinting, over data fetching from the
+database, to accessing the underlying file system and executing commands
+on the operating system via out-of-band connections.</P>
+
+<H2><A NAME="ss1.2">1.2</A> <A HREF="#toc1.2">How do I execute sqlmap?</A>
+</H2>
+
+<P>If you are running on a Unix/Linux system type the following command
+from a terminal:
+<BLOCKQUOTE><CODE>
+<PRE>
+python sqlmap.py -h
+</PRE>
+</CODE></BLOCKQUOTE>
+</P>
+
+<P>If you are running on a Windows system type the following command
+from a terminal:
+<BLOCKQUOTE><CODE>
+<PRE>
+C:\Python26\python.exe sqlmap.py -h
+</PRE>
+</CODE></BLOCKQUOTE>
+</P>
+
+<P>Where <CODE>C:\Python26</CODE> is the path where you installed 
+<A HREF="http://www.python.org">Python</A> <B>>= 2.6</B>.</P>
+
+<H2><A NAME="ss1.3">1.3</A> <A HREF="#toc1.3">Can I integrate sqlmap with a security tool I am developing?</A>
+</H2>
+
+<P>Yes. sqlmap is released under the terms of the GPLv2, which means that any
+derivative work must be distributed without further restrictions on the
+rights granted by the GPL itself. If this constitutes a problem, feel free
+to contact us so we can find a solution.</P>
+
+<H2><A NAME="ss1.4">1.4</A> <A HREF="#toc1.4">How can I integrate sqlmap with my own tool?</A>
+</H2>
+
+<P>TODO</P>
+
+<H2><A NAME="ss1.5">1.5</A> <A HREF="#toc1.5">Will you support other database management systems?</A>
+</H2>
+
+<P>Yes. There are plans to support also IBM DB2, Informix and Ingres at some
+point.</P>
+
+<H2><A NAME="ss1.6">1.6</A> <A HREF="#toc1.6">How can I occasionally contribute?</A>
+</H2>
+
+<P>All help is greatly appreciated. First of all download the tool, make sure
+you are running the latest development version from the Subversion
+repository, read the user's manual carefully, have fun with it during your
+penetration tests.
+If you find bugs or have ideas for possible improvements, feel free to
+<A HREF="http://www.sqlmap.org/#ml">get in touch on the mailing list</A>. Many people have 
+<A HREF="https://svn.sqlmap.org/sqlmap/trunk/sqlmap/doc/THANKS">contributed</A> in different ways to the sqlmap development.
+<B>You</B> can be the next!</P>
+
+<H2><A NAME="ss1.7">1.7</A> <A HREF="#toc1.7">Can I actively contribute in the long-term development?</A>
+</H2>
+
+<P>Yes, we are looking for people who can write some clean Python code, are
+up to do security research, know about web application security, database
+assessment and takeover, software refactoring and are motivated to join
+the development team.
+If this sounds interesting to you, 
+<A HREF="http://www.sqlmap.org/#developers">get in touch</A>!</P>
+
+<H2><A NAME="ss1.8">1.8</A> <A HREF="#toc1.8">How can I support the development?</A>
+</H2>
+
+<P>If you think that sqlmap is a great tool, it really played well during
+your penetration tests, or you simply like it, you, or your boss, can
+<A HREF="http://www.sqlmap.org/#donate">donate some money</A> to the developers via PayPal.</P>
+
+<H2><A NAME="ss1.9">1.9</A> <A HREF="#toc1.9">Can you hack a site for me?</A>
+</H2>
+
+<P><B>No</B>.</P>
+
+<H2><A NAME="ss1.10">1.10</A> <A HREF="#toc1.10">When sqlmap will switch to the Python 3?</A>
+</H2>
+
+<P>Currently there is no huge pressure on Python projects to switch to the new
+version of Python interpreter, as the process of switching, especially on
+larger projects can be cumbersome (due to the few backward incompatibilities).
+The switch will take place eventually, but currently it's a very low priority task.</P>
+
+<H2><A NAME="ss1.11">1.11</A> <A HREF="#toc1.11">What does <CODE>"WARNING unknown charset '...'"</CODE> mean?</A>
+</H2>
+
+<P>sqlmap needs to properly decode page content to be able to properly 
+detect and deal with internationalized characters. In some cases web developers
+are doing mistakes when declaring used web page charset (e.g. <CODE>iso_8859</CODE> instead 
+of standardized name <CODE>iso-8859</CODE>), which can cause problems. As a failsafe mechanism
+we've incorporated heuristic detection engine
+<A HREF="http://chardet.feedparser.org/">chardet</A>, 
+so in most cases sqlmap will deal with this kind of problems automatically.
+Nevertheless, you are strongly advised to report us back those typographic "mistakes" 
+so we could handle them manually inside the code.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/737">#1</A>
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1232">#2</A>
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1239">#3</A></P>
+
+<H2><A NAME="ss1.12">1.12</A> <A HREF="#toc1.12">How to use sqlmap with <CODE>mod_rewrite</CODE> enabled?</A>
+</H2>
+
+<P>Just put * to the place where sqlmap should check for injections in URI 
+itself. In example: <CODE>./sqlmap.py -u "www.site.com/id1/1*/id2/2"</CODE> sqlmap 
+will try to inject the payloads just at that place marked with * character.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/731">#1</A>
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/728">#2</A>
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1258">#3</A></P>
+
+<H2><A NAME="ss1.13">1.13</A> <A HREF="#toc1.13">Why is sqlmap not able to get password hashes in some cases?</A>
+</H2>
+
+<P>You most probably don't have enough permissions for querying on a system 
+table containing password hashes.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/714">#1</A></P>
+
+<H2><A NAME="ss1.14">1.14</A> <A HREF="#toc1.14">What is <CODE>-</CODE><CODE>-text-only</CODE> switch?</A>
+</H2>
+
+<P>Switch <CODE>-</CODE><CODE>-text-only</CODE> is used for removing non-textual data (tags, 
+javascripts, styles,...) from the retrieved page content to further 
+improve detection capabilities.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/699">#1</A></P>
+
+<H2><A NAME="ss1.15">1.15</A> <A HREF="#toc1.15">sqlmap is retrieving weird characters for even simplest data (e.g. <CODE>--banner</CODE>)?</A>
+</H2>
+
+<P>If everything you retrieve from the target is garbled, then you are 
+most probably dealing with false positive blind injection. Please 
+report the problem to the 
+<A HREF="mailto:dev@sqlmap.org">developers</A>.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/686">#1</A>
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1181">#2</A></P>
+
+<H2><A NAME="ss1.16">1.16</A> <A HREF="#toc1.16">I am getting <CODE>"CRITICAL connection timed"</CODE> while I am able to browse the site normally?</A>
+</H2>
+
+<P>There are few IDSes that filter out all sqlmap requests based on default 
+User-Agent HTTP header used (e.g. <CODE>"User-agent: sqlmap/1.0-dev"</CODE>). To prevent this
+kind of situations you are advised to use switch <CODE>-</CODE><CODE>-random-agent</CODE>.
+If you are getting those kind of messages for all targets then you
+most probably need to properly set up your proxy settings (switches <CODE>-</CODE><CODE>-proxy</CODE>
+and/or <CODE>-</CODE><CODE>-ignore-proxy</CODE>)</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1241">#1</A></P>
+
+<H2><A NAME="ss1.17">1.17</A> <A HREF="#toc1.17">Is it possible to use <CODE>"INSERT/UPDATE"</CODE> SQL commands via <CODE>-</CODE><CODE>-sql-query</CODE></A>
+and/or <CODE>-</CODE><CODE>-sql-shell</CODE>?</H2>
+
+<P>It is possible to use those commands, but only if the stacked injection is supported
+by the vulnerable target.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1237">#1</A></P>
+
+<H2><A NAME="ss1.18">1.18</A> <A HREF="#toc1.18">I am getting <CODE>"finally: SyntaxError: invalid syntax"</CODE> when trying to run sqlmap?</A>
+</H2>
+
+<P>You are most probably using outdated version of Python. sqlmap is generally
+supported by Python versions in range 2.5, 2.6 and 2.7, while you are strongly
+advised to use versions 2.6 and 2.7.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/1231">#1</A></P>
+
+<H2><A NAME="ss1.19">1.19</A> <A HREF="#toc1.19">sqlmap is not able to detect/exploit injection while other commercial tools are?</A>
+</H2>
+
+<P>Currently there are only two of us working on a pure good will and donating our 
+free time to the community. If you are not willing to help us achive better tool
+you are strongly advised to buy those commercial tool(s) and just 
+forget about the sqlmap.</P>
+
+<P>Question(s):
+<A HREF="http://thread.gmane.org/gmane.comp.security.sqlmap/970">#1</A></P>
+
+</BODY>
+</HTML>
diff --git a/doc/FAQ.pdf b/doc/FAQ.pdf
new file mode 100644
index 000000000..c963f28d2
Binary files /dev/null and b/doc/FAQ.pdf differ
diff --git a/doc/FAQ.sgml b/doc/FAQ.sgml
index 2cccee351..151bfa04d 100644
--- a/doc/FAQ.sgml
+++ b/doc/FAQ.sgml
@@ -7,7 +7,7 @@
 <htmlurl url="mailto:miroslav.stampar@gmail.com" name="Miroslav Stampar">
 <abstract>
 This document contains frequently asked questions for <htmlurl
-url="http://sqlmap.sourceforge.net" name="sqlmap">.
+url="http://www.sqlmap.org" name="sqlmap">.
 </abstract>
 
 <toc>
@@ -72,7 +72,7 @@ you are running the latest development version from the Subversion
 repository, read the user's manual carefully, have fun with it during your
 penetration tests.
 If you find bugs or have ideas for possible improvements, feel free to
-<htmlurl url="http://sqlmap.sourceforge.net/#ml" name="get in touch on the
+<htmlurl url="http://www.sqlmap.org/#ml" name="get in touch on the
 mailing list">. Many people have <htmlurl
 url="https://svn.sqlmap.org/sqlmap/trunk/sqlmap/doc/THANKS"
 name="contributed"> in different ways to the sqlmap development.
@@ -86,14 +86,14 @@ up to do security research, know about web application security, database
 assessment and takeover, software refactoring and are motivated to join
 the development team.
 If this sounds interesting to you, <htmlurl
-url="http://sqlmap.sourceforge.net/#developers" name="get in touch">!
+url="http://www.sqlmap.org/#developers" name="get in touch">!
 
 <sect1>How can I support the development?
 
 <p>
 If you think that sqlmap is a great tool, it really played well during
 your penetration tests, or you simply like it, you, or your boss, can
-<htmlurl url="http://sqlmap.sourceforge.net/#donate" name="donate
+<htmlurl url="http://www.sqlmap.org/#donate" name="donate
 some money"> to the developers via PayPal.
 
 <sect1>Can you hack a site for me?
diff --git a/doc/README.html b/doc/README.html
index dd22cd9f4..3b28407ae 100644
--- a/doc/README.html
+++ b/doc/README.html
@@ -12,7 +12,7 @@
 <A HREF="mailto:miroslav.stampar@gmail.com">Miroslav Stampar</A></H2>version 1.0-dev, XXX XX, 2011
 <HR>
 <EM>This document is the user's manual to use 
-<A HREF="http://sqlmap.sourceforge.net">sqlmap</A>.</EM>
+<A HREF="http://www.sqlmap.org">sqlmap</A>.</EM>
 <HR>
 <P>
 <H2><A NAME="toc1">1.</A> <A HREF="README.html#s1">Introduction</A></H2>
@@ -123,7 +123,7 @@ for the database management system that you are going to attack:</P>
 <LI>Microsoft SQL Server: 
 <A HREF="http://pymssql.sourceforge.net/">python-pymssql</A>.</LI>
 <LI>MySQL: 
-<A HREF="http://mysql-python.sourceforge.net/">python-mysqldb</A>.</LI>
+<A HREF="http://code.google.com/p/pymysql/">python pymysql</A>.</LI>
 <LI>Oracle: 
 <A HREF="http://cx-oracle.sourceforge.net/">python cx_Oracle</A>.</LI>
 <LI>PostgreSQL: 
@@ -562,7 +562,7 @@ the
 <P>
 <UL>
 <LI><B>April 10</B>, 
-<A HREF="http://sqlmap.sourceforge.net/#developers">Bernardo and Miroslav</A> release sqlmap
+<A HREF="http://www.sqlmap.org/#developers">Bernardo and Miroslav</A> release sqlmap
 <B>0.9</B> featuring a totally rewritten and powerful SQL injection
 detection engine, the possibility to connect directly to a database
 server, support for time-based blind SQL injection and error-based SQL
@@ -576,7 +576,7 @@ injection, support for four new database management systems and much more.</LI>
 <P>
 <UL>
 <LI><B>December</B>, 
-<A HREF="http://sqlmap.sourceforge.net/#developers">Bernardo and Miroslav</A> have enhanced sqlmap a
+<A HREF="http://www.sqlmap.org/#developers">Bernardo and Miroslav</A> have enhanced sqlmap a
 lot during the whole year and prepare to release sqlmap <B>0.9</B>
 within the first quarter of 2011.</LI>
 <LI><B>June 3</B>, Bernardo 
@@ -584,7 +584,7 @@ within the first quarter of 2011.</LI>
 a talk titled <EM>Got database access? Own the network!</EM> at AthCon
 2010 in Athens (Greece).</LI>
 <LI><B>March 14</B>, 
-<A HREF="http://sqlmap.sourceforge.net/#developers">Bernardo and Miroslav</A> release stable version of 
+<A HREF="http://www.sqlmap.org/#developers">Bernardo and Miroslav</A> release stable version of 
 sqlmap <B>0.8</B> featuring many features. Amongst these, support to
 enumerate and dump all databases' tables containing user provided
 column(s), stabilization and enhancements to the takeover functionalities,
@@ -616,7 +616,7 @@ for developers.
 </LI>
 <LI><B>December 4</B>, sqlmap-devel mailing list has been merged into
 sqlmap-users 
-<A HREF="http://sqlmap.sourceforge.net/#ml">mailing list</A>.
+<A HREF="http://www.sqlmap.org/#ml">mailing list</A>.
 </LI>
 <LI><B>November 20</B>, Bernardo and Guido present again their
 research on stealth database server takeover at CONfidence 2009 in Warsaw,
@@ -739,7 +739,7 @@ more options to enumerate and dump specific information are added, brand
 new installation packages for Debian, Red Hat, Windows and much more.
 </LI>
 <LI><B>August</B>, two public 
-<A HREF="http://sqlmap.sourceforge.net/#ml">mailing lists</A> are created on SourceForge.
+<A HREF="http://www.sqlmap.org/#ml">mailing lists</A> are created on SourceForge.
 </LI>
 <LI><B>January</B>, sqlmap subversion development repository is moved
 away from SourceForge and goes private for a while.</LI>
@@ -848,7 +848,7 @@ $ svn update
 </P>
 
 <P>This is strongly recommended <B>before</B> reporting any bug to the 
-<A HREF="http://sqlmap.sourceforge.net/#ml">mailing list</A>.</P>
+<A HREF="http://www.sqlmap.org/#ml">mailing list</A>.</P>
 
 
 <H2><A NAME="s5">5.</A> <A HREF="#toc5">Usage</A></H2>
@@ -859,7 +859,7 @@ $ svn update
 $ python sqlmap.py -h
 
     sqlmap/1.0 - automatic SQL injection and database takeover tool
-    http://sqlmap.sourceforge.net
+    http://www.sqlmap.org
 
 Usage: python sqlmap.py [options]
 
@@ -1229,7 +1229,7 @@ header value:</P>
 <P>
 <BLOCKQUOTE><CODE>
 <PRE>
-sqlmap/0.9 (http://sqlmap.sourceforge.net)
+sqlmap/0.9 (http://www.sqlmap.org)
 </PRE>
 </CODE></BLOCKQUOTE>
 </P>
@@ -3032,7 +3032,7 @@ by right-clicking in Windows Explorer into your sqlmap working copy and
 clicking on <CODE>Update</CODE>.</P>
 
 <P>This is strongly recommended <B>before</B> reporting any bug to the
-<A HREF="http://sqlmap.sourceforge.net/#ml">mailing lists</A>.</P>
+<A HREF="http://www.sqlmap.org/#ml">mailing lists</A>.</P>
 
 
 <H3>Save options in a configuration INI file</H3>
@@ -3177,7 +3177,7 @@ sqlite:///software/sqlmap/output/192.168.136.131/dump/testdb.sqlite3 --table</CO
 <P>sqlmap is released under the terms of the
 <A HREF="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">General Public License v2</A>.
 sqlmap is copyrighted by its 
-<A HREF="http://sqlmap.sourceforge.net/#developers">developers</A>.</P>
+<A HREF="http://www.sqlmap.org/#developers">developers</A>.</P>
 
 
 <H2><A NAME="s7">7.</A> <A HREF="#toc7">Disclaimer</A></H2>
diff --git a/doc/README.pdf b/doc/README.pdf
index a3d136738..3b6ed71d3 100644
Binary files a/doc/README.pdf and b/doc/README.pdf differ
diff --git a/doc/README.sgml b/doc/README.sgml
index e7553e0bd..06ec545c3 100644
--- a/doc/README.sgml
+++ b/doc/README.sgml
@@ -6,7 +6,7 @@
 <author>by <htmlurl url="mailto:bernardo.damele@gmail.com" name="Bernardo Damele A. G.">, <htmlurl url="mailto:miroslav.stampar@gmail.com" name="Miroslav Stampar">
 <date>version 1.0-dev, XXX XX, 2011
 <abstract>
-This document is the user's manual to use <htmlurl url="http://sqlmap.sourceforge.net" name="sqlmap">.
+This document is the user's manual to use <htmlurl url="http://www.sqlmap.org" name="sqlmap">.
 </abstract>
 
 <toc>
@@ -488,7 +488,7 @@ name="MS10-015">).
 <p>
 <itemize>
 <item><bf>April 10</bf>, <htmlurl name="Bernardo and Miroslav"
-url="http://sqlmap.sourceforge.net/#developers"> release sqlmap
+url="http://www.sqlmap.org/#developers"> release sqlmap
 <bf>0.9</bf> featuring a totally rewritten and powerful SQL injection
 detection engine, the possibility to connect directly to a database
 server, support for time-based blind SQL injection and error-based SQL
@@ -500,7 +500,7 @@ injection, support for four new database management systems and much more.
 <p>
 <itemize>
 <item><bf>December</bf>, <htmlurl name="Bernardo and Miroslav"
-url="http://sqlmap.sourceforge.net/#developers"> have enhanced sqlmap a
+url="http://www.sqlmap.org/#developers"> have enhanced sqlmap a
 lot during the whole year and prepare to release sqlmap <bf>0.9</bf>
 within the first quarter of 2011.
 <item><bf>June 3</bf>, Bernardo <htmlurl name="presents"
@@ -508,7 +508,7 @@ url="http://www.slideshare.net/inquis/ath-con-2010bernardodamelegotdbownnet">
 a talk titled <em>Got database access? Own the network!</em> at AthCon
 2010 in Athens (Greece).
 <item><bf>March 14</bf>, <htmlurl name="Bernardo and Miroslav"
-url="http://sqlmap.sourceforge.net/#developers"> release stable version of 
+url="http://www.sqlmap.org/#developers"> release stable version of 
 sqlmap <bf>0.8</bf> featuring many features. Amongst these, support to
 enumerate and dump all databases' tables containing user provided
 column(s), stabilization and enhancements to the takeover functionalities,
@@ -537,7 +537,7 @@ achieved during these first three years of the project and launches a call
 for developers.
 
 <item><bf>December 4</bf>, sqlmap-devel mailing list has been merged into
-sqlmap-users <htmlurl name="mailing list" url="http://sqlmap.sourceforge.net/#ml">.
+sqlmap-users <htmlurl name="mailing list" url="http://www.sqlmap.org/#ml">.
 
 <item><bf>November 20</bf>, Bernardo and Guido present again their
 research on stealth database server takeover at CONfidence 2009 in Warsaw,
@@ -662,7 +662,7 @@ more options to enumerate and dump specific information are added, brand
 new installation packages for Debian, Red Hat, Windows and much more.
 
 <item><bf>August</bf>, two public <htmlurl name="mailing lists"
-url="http://sqlmap.sourceforge.net/#ml"> are created on SourceForge.
+url="http://www.sqlmap.org/#ml"> are created on SourceForge.
 
 <item><bf>January</bf>, sqlmap subversion development repository is moved
 away from SourceForge and goes private for a while.
@@ -763,7 +763,7 @@ $ svn update
 
 <p>
 This is strongly recommended <bf>before</bf> reporting any bug to the 
-<htmlurl url="http://sqlmap.sourceforge.net/#ml" name="mailing list">.
+<htmlurl url="http://www.sqlmap.org/#ml" name="mailing list">.
 
 
 <sect>Usage
@@ -773,7 +773,7 @@ This is strongly recommended <bf>before</bf> reporting any bug to the
 $ python sqlmap.py -h
 
     sqlmap/1.0 - automatic SQL injection and database takeover tool
-    http://sqlmap.sourceforge.net
+    http://www.sqlmap.org
 
 Usage: python sqlmap.py [options]
 
@@ -1162,7 +1162,7 @@ By default sqlmap performs HTTP requests with the following <tt>User-Agent</tt>
 header value:
 
 <tscreen><verb>
-sqlmap/0.9 (http://sqlmap.sourceforge.net)
+sqlmap/0.9 (http://www.sqlmap.org)
 </verb></tscreen>
 
 <p>
@@ -3142,7 +3142,7 @@ clicking on <tt>Update</tt>.
 
 <p>
 This is strongly recommended <bf>before</bf> reporting any bug to the
-<htmlurl name="mailing lists" url="http://sqlmap.sourceforge.net/#ml">.
+<htmlurl name="mailing lists" url="http://www.sqlmap.org/#ml">.
 
 
 <sect2>Save options in a configuration INI file
@@ -3314,7 +3314,7 @@ Do you really want to know?
 <p>
 sqlmap is released under the terms of the
 <htmlurl url="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html" name="General Public License v2">.
-sqlmap is copyrighted by its <htmlurl url="http://sqlmap.sourceforge.net/#developers" name="developers">.
+sqlmap is copyrighted by its <htmlurl url="http://www.sqlmap.org/#developers" name="developers">.
 
 
 <sect>Disclaimer
diff --git a/extra/__init__.py b/extra/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/extra/__init__.py
+++ b/extra/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/cloak/__init__.py b/extra/cloak/__init__.py
index 70b6d1cc2..3b898a722 100755
--- a/extra/cloak/__init__.py
+++ b/extra/cloak/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/cloak/cloak.py b/extra/cloak/cloak.py
index 051b28113..6e027f6ff 100755
--- a/extra/cloak/cloak.py
+++ b/extra/cloak/cloak.py
@@ -5,7 +5,7 @@ $Id$
 
 cloak.py - Simple file encryption/compression utility
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/dbgtool/__init__.py b/extra/dbgtool/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/extra/dbgtool/__init__.py
+++ b/extra/dbgtool/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/dbgtool/dbgtool.py b/extra/dbgtool/dbgtool.py
index 759de2bda..07f8b9689 100755
--- a/extra/dbgtool/dbgtool.py
+++ b/extra/dbgtool/dbgtool.py
@@ -5,7 +5,7 @@ $Id$
 
 dbgtool.py - Portable executable to ASCII debug script converter
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/msfauxmod/sqlmap.rb b/extra/msfauxmod/sqlmap.rb
index ad6b19ff8..38f8653a4 100644
--- a/extra/msfauxmod/sqlmap.rb
+++ b/extra/msfauxmod/sqlmap.rb
@@ -39,7 +39,7 @@ class Metasploit3 < Msf::Auxiliary
 			'Version'		=> '$Revision: 9212 $',
 			'References'	=>
 				[
-					['URL', 'http://sqlmap.sourceforge.net'],
+					['URL', 'http://www.sqlmap.org'],
 				]
 			))
 
diff --git a/extra/mssqlsig/update.py b/extra/mssqlsig/update.py
index 071561abe..9aae0d7ae 100644
--- a/extra/mssqlsig/update.py
+++ b/extra/mssqlsig/update.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/safe2bin/__init__.py b/extra/safe2bin/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/extra/safe2bin/__init__.py
+++ b/extra/safe2bin/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/safe2bin/safe2bin.py b/extra/safe2bin/safe2bin.py
index 14e5898f9..ff2ee07c0 100755
--- a/extra/safe2bin/safe2bin.py
+++ b/extra/safe2bin/safe2bin.py
@@ -5,7 +5,7 @@ $Id$
 
 safe2bin.py - Simple safe(hex) to binary format converter
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/shutils/blanks.sh b/extra/shutils/blanks.sh
index 2b640a41a..85d7c8a31 100755
--- a/extra/shutils/blanks.sh
+++ b/extra/shutils/blanks.sh
@@ -2,7 +2,7 @@
 
 # $Id$
 
-# Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+# Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 # See the file 'doc/COPYING' for copying permission
 
 # Removes trailing spaces from blank lines inside project files
diff --git a/extra/shutils/duplicates.py b/extra/shutils/duplicates.py
index c9c299b02..2181aa7af 100644
--- a/extra/shutils/duplicates.py
+++ b/extra/shutils/duplicates.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/shutils/id.sh b/extra/shutils/id.sh
index 5320610fa..3c53f1672 100755
--- a/extra/shutils/id.sh
+++ b/extra/shutils/id.sh
@@ -2,7 +2,7 @@
 
 # $Id$
 
-# Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+# Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 # See the file 'doc/COPYING' for copying permission
 
 # Adds SVN property 'Id' to project files
diff --git a/extra/socks/__init__.py b/extra/socks/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/extra/socks/__init__.py
+++ b/extra/socks/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/sqlharvest/__init__.py b/extra/sqlharvest/__init__.py
index 70b6d1cc2..3b898a722 100755
--- a/extra/sqlharvest/__init__.py
+++ b/extra/sqlharvest/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/extra/sqlharvest/sqlharvest.py b/extra/sqlharvest/sqlharvest.py
index 3c4fb246d..23f51723a 100644
--- a/extra/sqlharvest/sqlharvest.py
+++ b/extra/sqlharvest/sqlharvest.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/__init__.py b/lib/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/__init__.py
+++ b/lib/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/controller/__init__.py b/lib/controller/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/controller/__init__.py
+++ b/lib/controller/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/controller/action.py b/lib/controller/action.py
index 2ea42556f..4f2bb0863 100644
--- a/lib/controller/action.py
+++ b/lib/controller/action.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index a3623e254..d86ece261 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/controller/controller.py b/lib/controller/controller.py
index 3fbda9739..e9d531609 100644
--- a/lib/controller/controller.py
+++ b/lib/controller/controller.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/controller/handler.py b/lib/controller/handler.py
index 1b3117c19..b69477253 100644
--- a/lib/controller/handler.py
+++ b/lib/controller/handler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/__init__.py b/lib/core/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/core/__init__.py
+++ b/lib/core/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/agent.py b/lib/core/agent.py
index c1ba3833d..c77efb313 100644
--- a/lib/core/agent.py
+++ b/lib/core/agent.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/common.py b/lib/core/common.py
index b96ff1a0d..6b67afb18 100644
--- a/lib/core/common.py
+++ b/lib/core/common.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/convert.py b/lib/core/convert.py
index 6746a1fa6..97fd678a0 100644
--- a/lib/core/convert.py
+++ b/lib/core/convert.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/data.py b/lib/core/data.py
index 8336ff00f..53b5635bb 100644
--- a/lib/core/data.py
+++ b/lib/core/data.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/datatype.py b/lib/core/datatype.py
index 1405b7c1e..33402a394 100644
--- a/lib/core/datatype.py
+++ b/lib/core/datatype.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/defaults.py b/lib/core/defaults.py
index fd42db4c4..4e4617578 100644
--- a/lib/core/defaults.py
+++ b/lib/core/defaults.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/dicts.py b/lib/core/dicts.py
index d097e4a74..6d970c8e9 100644
--- a/lib/core/dicts.py
+++ b/lib/core/dicts.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/dump.py b/lib/core/dump.py
index a66c7461f..17d3108a2 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/enums.py b/lib/core/enums.py
index 6c86f2f1c..dfee64c5f 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/exception.py b/lib/core/exception.py
index b61c8f4e4..434b2a213 100644
--- a/lib/core/exception.py
+++ b/lib/core/exception.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/option.py b/lib/core/option.py
index 879bbdeb1..745335f7a 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/optiondict.py b/lib/core/optiondict.py
index 1b50f23d5..e9f32e810 100644
--- a/lib/core/optiondict.py
+++ b/lib/core/optiondict.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/profiling.py b/lib/core/profiling.py
index 995f40028..945d081ec 100644
--- a/lib/core/profiling.py
+++ b/lib/core/profiling.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/progress.py b/lib/core/progress.py
index 0754846de..a27dadbee 100644
--- a/lib/core/progress.py
+++ b/lib/core/progress.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/readlineng.py b/lib/core/readlineng.py
index 39be437a8..9987a004b 100644
--- a/lib/core/readlineng.py
+++ b/lib/core/readlineng.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/replication.py b/lib/core/replication.py
index d4bd1861e..a1ee8cab3 100644
--- a/lib/core/replication.py
+++ b/lib/core/replication.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/revision.py b/lib/core/revision.py
index e96811759..9b71fc9e8 100644
--- a/lib/core/revision.py
+++ b/lib/core/revision.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/session.py b/lib/core/session.py
index 6645a8915..335d86a9e 100644
--- a/lib/core/session.py
+++ b/lib/core/session.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 3bb7983a5..ce10eaddd 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/shell.py b/lib/core/shell.py
index 2172d10e6..9038b2263 100644
--- a/lib/core/shell.py
+++ b/lib/core/shell.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/subprocessng.py b/lib/core/subprocessng.py
index 02bde695c..c4bf9f54b 100644
--- a/lib/core/subprocessng.py
+++ b/lib/core/subprocessng.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/target.py b/lib/core/target.py
index a009f7ec6..c09dab81e 100644
--- a/lib/core/target.py
+++ b/lib/core/target.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/testing.py b/lib/core/testing.py
index 14432ec3e..45d1b95a4 100644
--- a/lib/core/testing.py
+++ b/lib/core/testing.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/threads.py b/lib/core/threads.py
index 0266c14b5..1d45bc373 100644
--- a/lib/core/threads.py
+++ b/lib/core/threads.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/unescaper.py b/lib/core/unescaper.py
index 74b03bffa..ba5227f94 100644
--- a/lib/core/unescaper.py
+++ b/lib/core/unescaper.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/core/update.py b/lib/core/update.py
index b90bd8277..2451b2b74 100644
--- a/lib/core/update.py
+++ b/lib/core/update.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/__init__.py b/lib/parse/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/parse/__init__.py
+++ b/lib/parse/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/banner.py b/lib/parse/banner.py
index cfd083831..d3f2b5573 100644
--- a/lib/parse/banner.py
+++ b/lib/parse/banner.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/cmdline.py b/lib/parse/cmdline.py
index edf5c890f..8fc6dbb31 100644
--- a/lib/parse/cmdline.py
+++ b/lib/parse/cmdline.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/configfile.py b/lib/parse/configfile.py
index 1871d4033..f10f1caed 100644
--- a/lib/parse/configfile.py
+++ b/lib/parse/configfile.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/handler.py b/lib/parse/handler.py
index 375099fd4..d40212fd3 100644
--- a/lib/parse/handler.py
+++ b/lib/parse/handler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/headers.py b/lib/parse/headers.py
index 7fcb56bca..8430ea29b 100644
--- a/lib/parse/headers.py
+++ b/lib/parse/headers.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/html.py b/lib/parse/html.py
index 022c4053f..5cf43f98f 100644
--- a/lib/parse/html.py
+++ b/lib/parse/html.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/parse/payloads.py b/lib/parse/payloads.py
index c99c455de..c54e74361 100644
--- a/lib/parse/payloads.py
+++ b/lib/parse/payloads.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/__init__.py b/lib/request/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/request/__init__.py
+++ b/lib/request/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/basic.py b/lib/request/basic.py
index 2b93f48de..c946b2437 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/basicauthhandler.py b/lib/request/basicauthhandler.py
index d6567e571..8b3fa18c4 100644
--- a/lib/request/basicauthhandler.py
+++ b/lib/request/basicauthhandler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/certhandler.py b/lib/request/certhandler.py
index 0691fb19a..af9310677 100644
--- a/lib/request/certhandler.py
+++ b/lib/request/certhandler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/comparison.py b/lib/request/comparison.py
index 2b3fcbd65..ad626cfc3 100644
--- a/lib/request/comparison.py
+++ b/lib/request/comparison.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/connect.py b/lib/request/connect.py
index 0986a9509..716be2106 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/direct.py b/lib/request/direct.py
index d808ef69d..1dac86290 100644
--- a/lib/request/direct.py
+++ b/lib/request/direct.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/inject.py b/lib/request/inject.py
index 2f488a060..61911e100 100644
--- a/lib/request/inject.py
+++ b/lib/request/inject.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/methodrequest.py b/lib/request/methodrequest.py
index 4df12f893..57207a815 100644
--- a/lib/request/methodrequest.py
+++ b/lib/request/methodrequest.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/proxy.py b/lib/request/proxy.py
index 5ffc188b2..c01c5a87c 100644
--- a/lib/request/proxy.py
+++ b/lib/request/proxy.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/rangehandler.py b/lib/request/rangehandler.py
index 0b96c018c..d0902a2c8 100644
--- a/lib/request/rangehandler.py
+++ b/lib/request/rangehandler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/redirecthandler.py b/lib/request/redirecthandler.py
index 8ac7ab9b4..458f598ad 100644
--- a/lib/request/redirecthandler.py
+++ b/lib/request/redirecthandler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/request/templates.py b/lib/request/templates.py
index f15a18265..c0b06c754 100644
--- a/lib/request/templates.py
+++ b/lib/request/templates.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/__init__.py b/lib/takeover/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/takeover/__init__.py
+++ b/lib/takeover/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/abstraction.py b/lib/takeover/abstraction.py
index 759197939..5514df4b8 100644
--- a/lib/takeover/abstraction.py
+++ b/lib/takeover/abstraction.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/icmpsh.py b/lib/takeover/icmpsh.py
index 2c83c5046..9b3818cf8 100644
--- a/lib/takeover/icmpsh.py
+++ b/lib/takeover/icmpsh.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/metasploit.py b/lib/takeover/metasploit.py
index ad2338889..9ec4e00db 100644
--- a/lib/takeover/metasploit.py
+++ b/lib/takeover/metasploit.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/registry.py b/lib/takeover/registry.py
index 0c1d843b8..2bb70961c 100644
--- a/lib/takeover/registry.py
+++ b/lib/takeover/registry.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/udf.py b/lib/takeover/udf.py
index 8c0fcb292..42d4eadd8 100644
--- a/lib/takeover/udf.py
+++ b/lib/takeover/udf.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/web.py b/lib/takeover/web.py
index fa725c164..a76a25ec1 100644
--- a/lib/takeover/web.py
+++ b/lib/takeover/web.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/takeover/xp_cmdshell.py b/lib/takeover/xp_cmdshell.py
index d685fef33..cb125f66c 100644
--- a/lib/takeover/xp_cmdshell.py
+++ b/lib/takeover/xp_cmdshell.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/__init__.py b/lib/techniques/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/techniques/__init__.py
+++ b/lib/techniques/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/blind/__init__.py b/lib/techniques/blind/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/techniques/blind/__init__.py
+++ b/lib/techniques/blind/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/blind/inference.py b/lib/techniques/blind/inference.py
index f11855cd4..a21ccb30f 100644
--- a/lib/techniques/blind/inference.py
+++ b/lib/techniques/blind/inference.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/brute/__init__.py b/lib/techniques/brute/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/techniques/brute/__init__.py
+++ b/lib/techniques/brute/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/brute/use.py b/lib/techniques/brute/use.py
index f87ef0d0a..25caf5c37 100644
--- a/lib/techniques/brute/use.py
+++ b/lib/techniques/brute/use.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/error/__init__.py b/lib/techniques/error/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/techniques/error/__init__.py
+++ b/lib/techniques/error/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/error/use.py b/lib/techniques/error/use.py
index 47828f474..0f9dde4a0 100644
--- a/lib/techniques/error/use.py
+++ b/lib/techniques/error/use.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/union/__init__.py b/lib/techniques/union/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/techniques/union/__init__.py
+++ b/lib/techniques/union/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/union/test.py b/lib/techniques/union/test.py
index a883d3b51..f074b41e2 100644
--- a/lib/techniques/union/test.py
+++ b/lib/techniques/union/test.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/techniques/union/use.py b/lib/techniques/union/use.py
index 4aa1a3a76..aea8267e1 100644
--- a/lib/techniques/union/use.py
+++ b/lib/techniques/union/use.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/lib/utils/__init__.py
+++ b/lib/utils/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/checkpayload.py b/lib/utils/checkpayload.py
index dce6f9057..aff9d02b5 100644
--- a/lib/utils/checkpayload.py
+++ b/lib/utils/checkpayload.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/crawler.py b/lib/utils/crawler.py
index caf54ae20..7fed32006 100644
--- a/lib/utils/crawler.py
+++ b/lib/utils/crawler.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/deps.py b/lib/utils/deps.py
index e577f3d35..db95df5f9 100644
--- a/lib/utils/deps.py
+++ b/lib/utils/deps.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/getch.py b/lib/utils/getch.py
index 6d4e470d4..0cb019efb 100644
--- a/lib/utils/getch.py
+++ b/lib/utils/getch.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/google.py b/lib/utils/google.py
index 638df835f..ae0e25462 100644
--- a/lib/utils/google.py
+++ b/lib/utils/google.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/hash.py b/lib/utils/hash.py
index e24a0eb4b..8c5f10532 100644
--- a/lib/utils/hash.py
+++ b/lib/utils/hash.py
@@ -4,7 +4,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/resume.py b/lib/utils/resume.py
index e03cdbbec..718d4b73a 100644
--- a/lib/utils/resume.py
+++ b/lib/utils/resume.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/lib/utils/timeout.py b/lib/utils/timeout.py
index ab0909864..45dcf53e8 100644
--- a/lib/utils/timeout.py
+++ b/lib/utils/timeout.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/__init__.py b/plugins/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/plugins/__init__.py
+++ b/plugins/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/__init__.py b/plugins/dbms/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/plugins/dbms/__init__.py
+++ b/plugins/dbms/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/__init__.py b/plugins/dbms/access/__init__.py
index 53805b446..43c93eaef 100644
--- a/plugins/dbms/access/__init__.py
+++ b/plugins/dbms/access/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/connector.py b/plugins/dbms/access/connector.py
index a63391362..d0cd0d502 100644
--- a/plugins/dbms/access/connector.py
+++ b/plugins/dbms/access/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/enumeration.py b/plugins/dbms/access/enumeration.py
index 0254a92ee..cd7171132 100644
--- a/plugins/dbms/access/enumeration.py
+++ b/plugins/dbms/access/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/filesystem.py b/plugins/dbms/access/filesystem.py
index bc22daf2e..e59806e1a 100644
--- a/plugins/dbms/access/filesystem.py
+++ b/plugins/dbms/access/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/fingerprint.py b/plugins/dbms/access/fingerprint.py
index 6a2c92ba9..0652b4d96 100644
--- a/plugins/dbms/access/fingerprint.py
+++ b/plugins/dbms/access/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/syntax.py b/plugins/dbms/access/syntax.py
index 5b73a99d0..e33564e87 100644
--- a/plugins/dbms/access/syntax.py
+++ b/plugins/dbms/access/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/access/takeover.py b/plugins/dbms/access/takeover.py
index 1b2083fd6..8e85f46b0 100644
--- a/plugins/dbms/access/takeover.py
+++ b/plugins/dbms/access/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/__init__.py b/plugins/dbms/db2/__init__.py
index d699ecccc..cf049d6c7 100644
--- a/plugins/dbms/db2/__init__.py
+++ b/plugins/dbms/db2/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/connector.py b/plugins/dbms/db2/connector.py
index 8de77e2a9..00e0ad865 100644
--- a/plugins/dbms/db2/connector.py
+++ b/plugins/dbms/db2/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/enumeration.py b/plugins/dbms/db2/enumeration.py
index 974e87746..da4354b84 100644
--- a/plugins/dbms/db2/enumeration.py
+++ b/plugins/dbms/db2/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/filesystem.py b/plugins/dbms/db2/filesystem.py
index c28a3da1a..4c2d39bb7 100644
--- a/plugins/dbms/db2/filesystem.py
+++ b/plugins/dbms/db2/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/fingerprint.py b/plugins/dbms/db2/fingerprint.py
index 3951c7058..dd7843979 100644
--- a/plugins/dbms/db2/fingerprint.py
+++ b/plugins/dbms/db2/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/syntax.py b/plugins/dbms/db2/syntax.py
index 4fc810056..fbc65c2a8 100644
--- a/plugins/dbms/db2/syntax.py
+++ b/plugins/dbms/db2/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/db2/takeover.py b/plugins/dbms/db2/takeover.py
index d490276ec..8b862a342 100644
--- a/plugins/dbms/db2/takeover.py
+++ b/plugins/dbms/db2/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/__init__.py b/plugins/dbms/firebird/__init__.py
index 94131b98f..43656fa29 100644
--- a/plugins/dbms/firebird/__init__.py
+++ b/plugins/dbms/firebird/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/connector.py b/plugins/dbms/firebird/connector.py
index 65d5b3e5e..6b3f45510 100644
--- a/plugins/dbms/firebird/connector.py
+++ b/plugins/dbms/firebird/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/enumeration.py b/plugins/dbms/firebird/enumeration.py
index b84ae0596..30cf21338 100644
--- a/plugins/dbms/firebird/enumeration.py
+++ b/plugins/dbms/firebird/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/filesystem.py b/plugins/dbms/firebird/filesystem.py
index 31963a4cd..76a6a8a10 100644
--- a/plugins/dbms/firebird/filesystem.py
+++ b/plugins/dbms/firebird/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/fingerprint.py b/plugins/dbms/firebird/fingerprint.py
index b6e2b5c93..a4bb55785 100644
--- a/plugins/dbms/firebird/fingerprint.py
+++ b/plugins/dbms/firebird/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/syntax.py b/plugins/dbms/firebird/syntax.py
index 61c4c3f27..cbcbddc2e 100644
--- a/plugins/dbms/firebird/syntax.py
+++ b/plugins/dbms/firebird/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/firebird/takeover.py b/plugins/dbms/firebird/takeover.py
index d335909d0..1be727ebf 100644
--- a/plugins/dbms/firebird/takeover.py
+++ b/plugins/dbms/firebird/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/__init__.py b/plugins/dbms/maxdb/__init__.py
index 30900325e..262a91615 100644
--- a/plugins/dbms/maxdb/__init__.py
+++ b/plugins/dbms/maxdb/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/connector.py b/plugins/dbms/maxdb/connector.py
index f756bab5b..5582e37b4 100644
--- a/plugins/dbms/maxdb/connector.py
+++ b/plugins/dbms/maxdb/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/enumeration.py b/plugins/dbms/maxdb/enumeration.py
index a14ba4dc9..3613e3156 100644
--- a/plugins/dbms/maxdb/enumeration.py
+++ b/plugins/dbms/maxdb/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/filesystem.py b/plugins/dbms/maxdb/filesystem.py
index 27c4f5a9f..237aa5c89 100644
--- a/plugins/dbms/maxdb/filesystem.py
+++ b/plugins/dbms/maxdb/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/fingerprint.py b/plugins/dbms/maxdb/fingerprint.py
index b60aa1ec6..9303d3ac0 100644
--- a/plugins/dbms/maxdb/fingerprint.py
+++ b/plugins/dbms/maxdb/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/syntax.py b/plugins/dbms/maxdb/syntax.py
index b9218a1b4..a291695ba 100644
--- a/plugins/dbms/maxdb/syntax.py
+++ b/plugins/dbms/maxdb/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/maxdb/takeover.py b/plugins/dbms/maxdb/takeover.py
index d26ae2e33..65a17d640 100644
--- a/plugins/dbms/maxdb/takeover.py
+++ b/plugins/dbms/maxdb/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/__init__.py b/plugins/dbms/mssqlserver/__init__.py
index b1e52c516..2824e5a04 100644
--- a/plugins/dbms/mssqlserver/__init__.py
+++ b/plugins/dbms/mssqlserver/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/connector.py b/plugins/dbms/mssqlserver/connector.py
index fe344a24f..bdade1757 100644
--- a/plugins/dbms/mssqlserver/connector.py
+++ b/plugins/dbms/mssqlserver/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/enumeration.py b/plugins/dbms/mssqlserver/enumeration.py
index 90b79cb4f..3a1ee6415 100644
--- a/plugins/dbms/mssqlserver/enumeration.py
+++ b/plugins/dbms/mssqlserver/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/filesystem.py b/plugins/dbms/mssqlserver/filesystem.py
index ba6ee494e..2b798d216 100644
--- a/plugins/dbms/mssqlserver/filesystem.py
+++ b/plugins/dbms/mssqlserver/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/fingerprint.py b/plugins/dbms/mssqlserver/fingerprint.py
index c8024431f..1a752587f 100644
--- a/plugins/dbms/mssqlserver/fingerprint.py
+++ b/plugins/dbms/mssqlserver/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/syntax.py b/plugins/dbms/mssqlserver/syntax.py
index 796462249..02c305c4a 100644
--- a/plugins/dbms/mssqlserver/syntax.py
+++ b/plugins/dbms/mssqlserver/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mssqlserver/takeover.py b/plugins/dbms/mssqlserver/takeover.py
index 94bab78a2..a3139a04a 100644
--- a/plugins/dbms/mssqlserver/takeover.py
+++ b/plugins/dbms/mssqlserver/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/__init__.py b/plugins/dbms/mysql/__init__.py
index 7781c01ea..d945d8092 100644
--- a/plugins/dbms/mysql/__init__.py
+++ b/plugins/dbms/mysql/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/connector.py b/plugins/dbms/mysql/connector.py
index 80f35d2de..cad8c4ac3 100644
--- a/plugins/dbms/mysql/connector.py
+++ b/plugins/dbms/mysql/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/enumeration.py b/plugins/dbms/mysql/enumeration.py
index 7915a7886..c7b65897a 100644
--- a/plugins/dbms/mysql/enumeration.py
+++ b/plugins/dbms/mysql/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/filesystem.py b/plugins/dbms/mysql/filesystem.py
index 6973fed22..de4796ae5 100644
--- a/plugins/dbms/mysql/filesystem.py
+++ b/plugins/dbms/mysql/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/fingerprint.py b/plugins/dbms/mysql/fingerprint.py
index d06b9a791..cc2b59c3f 100644
--- a/plugins/dbms/mysql/fingerprint.py
+++ b/plugins/dbms/mysql/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/syntax.py b/plugins/dbms/mysql/syntax.py
index 1c3f23c29..98ebc750f 100644
--- a/plugins/dbms/mysql/syntax.py
+++ b/plugins/dbms/mysql/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/mysql/takeover.py b/plugins/dbms/mysql/takeover.py
index 42f0cf49b..4d8dbe132 100644
--- a/plugins/dbms/mysql/takeover.py
+++ b/plugins/dbms/mysql/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/__init__.py b/plugins/dbms/oracle/__init__.py
index 800942cca..3ce571610 100644
--- a/plugins/dbms/oracle/__init__.py
+++ b/plugins/dbms/oracle/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/connector.py b/plugins/dbms/oracle/connector.py
index 1a185d965..1afb6c83b 100644
--- a/plugins/dbms/oracle/connector.py
+++ b/plugins/dbms/oracle/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/enumeration.py b/plugins/dbms/oracle/enumeration.py
index 51e3914b7..ce39df1f7 100644
--- a/plugins/dbms/oracle/enumeration.py
+++ b/plugins/dbms/oracle/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/filesystem.py b/plugins/dbms/oracle/filesystem.py
index 070f94ba6..96d7376eb 100644
--- a/plugins/dbms/oracle/filesystem.py
+++ b/plugins/dbms/oracle/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/fingerprint.py b/plugins/dbms/oracle/fingerprint.py
index 5e754f40c..c8c4a5a59 100644
--- a/plugins/dbms/oracle/fingerprint.py
+++ b/plugins/dbms/oracle/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/syntax.py b/plugins/dbms/oracle/syntax.py
index 94707ad2d..f1745bfa1 100644
--- a/plugins/dbms/oracle/syntax.py
+++ b/plugins/dbms/oracle/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/oracle/takeover.py b/plugins/dbms/oracle/takeover.py
index 3f7f1d885..ac23357a2 100644
--- a/plugins/dbms/oracle/takeover.py
+++ b/plugins/dbms/oracle/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/__init__.py b/plugins/dbms/postgresql/__init__.py
index 43d29f728..9824fc3be 100644
--- a/plugins/dbms/postgresql/__init__.py
+++ b/plugins/dbms/postgresql/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/connector.py b/plugins/dbms/postgresql/connector.py
index 39bdeefc7..ae3bc39ac 100644
--- a/plugins/dbms/postgresql/connector.py
+++ b/plugins/dbms/postgresql/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/enumeration.py b/plugins/dbms/postgresql/enumeration.py
index f3af9a374..6b0136e00 100644
--- a/plugins/dbms/postgresql/enumeration.py
+++ b/plugins/dbms/postgresql/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/filesystem.py b/plugins/dbms/postgresql/filesystem.py
index d8d29b26a..7dc44855e 100644
--- a/plugins/dbms/postgresql/filesystem.py
+++ b/plugins/dbms/postgresql/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/fingerprint.py b/plugins/dbms/postgresql/fingerprint.py
index 280a44095..3f007f434 100644
--- a/plugins/dbms/postgresql/fingerprint.py
+++ b/plugins/dbms/postgresql/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/syntax.py b/plugins/dbms/postgresql/syntax.py
index 5e431a057..852a43643 100644
--- a/plugins/dbms/postgresql/syntax.py
+++ b/plugins/dbms/postgresql/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/postgresql/takeover.py b/plugins/dbms/postgresql/takeover.py
index 859631df7..1dc1d8bb8 100644
--- a/plugins/dbms/postgresql/takeover.py
+++ b/plugins/dbms/postgresql/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/__init__.py b/plugins/dbms/sqlite/__init__.py
index 85a752b68..d1f380606 100644
--- a/plugins/dbms/sqlite/__init__.py
+++ b/plugins/dbms/sqlite/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/connector.py b/plugins/dbms/sqlite/connector.py
index da4e5e8f7..e3c22db5f 100644
--- a/plugins/dbms/sqlite/connector.py
+++ b/plugins/dbms/sqlite/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/enumeration.py b/plugins/dbms/sqlite/enumeration.py
index 85312d525..ddb4c0297 100644
--- a/plugins/dbms/sqlite/enumeration.py
+++ b/plugins/dbms/sqlite/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/filesystem.py b/plugins/dbms/sqlite/filesystem.py
index 427ed1990..4e15690c2 100644
--- a/plugins/dbms/sqlite/filesystem.py
+++ b/plugins/dbms/sqlite/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/fingerprint.py b/plugins/dbms/sqlite/fingerprint.py
index 18085f198..2e8e908da 100644
--- a/plugins/dbms/sqlite/fingerprint.py
+++ b/plugins/dbms/sqlite/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/syntax.py b/plugins/dbms/sqlite/syntax.py
index 162bad26a..4babe035b 100644
--- a/plugins/dbms/sqlite/syntax.py
+++ b/plugins/dbms/sqlite/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sqlite/takeover.py b/plugins/dbms/sqlite/takeover.py
index cc55e7159..e97a6bcc4 100644
--- a/plugins/dbms/sqlite/takeover.py
+++ b/plugins/dbms/sqlite/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/__init__.py b/plugins/dbms/sybase/__init__.py
index 9450e3a5e..a4e6704d9 100644
--- a/plugins/dbms/sybase/__init__.py
+++ b/plugins/dbms/sybase/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/connector.py b/plugins/dbms/sybase/connector.py
index fe344a24f..bdade1757 100644
--- a/plugins/dbms/sybase/connector.py
+++ b/plugins/dbms/sybase/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/enumeration.py b/plugins/dbms/sybase/enumeration.py
index 52344a48f..378a38f5e 100644
--- a/plugins/dbms/sybase/enumeration.py
+++ b/plugins/dbms/sybase/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/filesystem.py b/plugins/dbms/sybase/filesystem.py
index 288c8f477..c5e5c9a78 100644
--- a/plugins/dbms/sybase/filesystem.py
+++ b/plugins/dbms/sybase/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/fingerprint.py b/plugins/dbms/sybase/fingerprint.py
index c2a37f382..e95a69cf7 100644
--- a/plugins/dbms/sybase/fingerprint.py
+++ b/plugins/dbms/sybase/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/syntax.py b/plugins/dbms/sybase/syntax.py
index 3fc85ee2a..9046d42e0 100644
--- a/plugins/dbms/sybase/syntax.py
+++ b/plugins/dbms/sybase/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/dbms/sybase/takeover.py b/plugins/dbms/sybase/takeover.py
index 456d23cfd..38c36b889 100644
--- a/plugins/dbms/sybase/takeover.py
+++ b/plugins/dbms/sybase/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/__init__.py b/plugins/generic/__init__.py
index 70b6d1cc2..3b898a722 100644
--- a/plugins/generic/__init__.py
+++ b/plugins/generic/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/connector.py b/plugins/generic/connector.py
index b2dc0a553..aa349707c 100644
--- a/plugins/generic/connector.py
+++ b/plugins/generic/connector.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py
index 98e5acc96..9c19bc424 100644
--- a/plugins/generic/enumeration.py
+++ b/plugins/generic/enumeration.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/filesystem.py b/plugins/generic/filesystem.py
index 58f524f80..bb07632fb 100644
--- a/plugins/generic/filesystem.py
+++ b/plugins/generic/filesystem.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/fingerprint.py b/plugins/generic/fingerprint.py
index d2910f99c..107d9aa85 100644
--- a/plugins/generic/fingerprint.py
+++ b/plugins/generic/fingerprint.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/misc.py b/plugins/generic/misc.py
index b1480d503..993affec0 100644
--- a/plugins/generic/misc.py
+++ b/plugins/generic/misc.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/syntax.py b/plugins/generic/syntax.py
index 52b5a1640..faf34045c 100644
--- a/plugins/generic/syntax.py
+++ b/plugins/generic/syntax.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/plugins/generic/takeover.py b/plugins/generic/takeover.py
index 80326d64d..44ccfd865 100644
--- a/plugins/generic/takeover.py
+++ b/plugins/generic/takeover.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/sqlmap.py b/sqlmap.py
index dbc9cbad2..71943ec93 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/__init__.py b/tamper/__init__.py
index 47d5a015d..ffa486a93 100644
--- a/tamper/__init__.py
+++ b/tamper/__init__.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/apostrophemask.py b/tamper/apostrophemask.py
index 1e899e3f8..a921e43fb 100644
--- a/tamper/apostrophemask.py
+++ b/tamper/apostrophemask.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/appendnullbyte.py b/tamper/appendnullbyte.py
index ba0b23a97..d330832e2 100644
--- a/tamper/appendnullbyte.py
+++ b/tamper/appendnullbyte.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/between.py b/tamper/between.py
index 5a112fb56..77d3f5a66 100644
--- a/tamper/between.py
+++ b/tamper/between.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/chardoubleencode.py b/tamper/chardoubleencode.py
index 57e0028aa..40dcb5f94 100644
--- a/tamper/chardoubleencode.py
+++ b/tamper/chardoubleencode.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/charencode.py b/tamper/charencode.py
index 39ac1cdd3..051ebc191 100644
--- a/tamper/charencode.py
+++ b/tamper/charencode.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/charunicodeencode.py b/tamper/charunicodeencode.py
index 7a7497e1d..fa34bab93 100644
--- a/tamper/charunicodeencode.py
+++ b/tamper/charunicodeencode.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/equaltolike.py b/tamper/equaltolike.py
index 513504c1f..2c9c55d3c 100644
--- a/tamper/equaltolike.py
+++ b/tamper/equaltolike.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/halfversionedmorekeywords.py b/tamper/halfversionedmorekeywords.py
index 88a64f485..4eef80031 100644
--- a/tamper/halfversionedmorekeywords.py
+++ b/tamper/halfversionedmorekeywords.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/ifnull2ifisnull.py b/tamper/ifnull2ifisnull.py
index 18946befa..18f596a94 100644
--- a/tamper/ifnull2ifisnull.py
+++ b/tamper/ifnull2ifisnull.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/multiplespaces.py b/tamper/multiplespaces.py
index 641127e3a..b0eead954 100644
--- a/tamper/multiplespaces.py
+++ b/tamper/multiplespaces.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/randomcase.py b/tamper/randomcase.py
index 4b027453f..e1cef816a 100644
--- a/tamper/randomcase.py
+++ b/tamper/randomcase.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/randomcomments.py b/tamper/randomcomments.py
index 62597fc72..9ea716a27 100644
--- a/tamper/randomcomments.py
+++ b/tamper/randomcomments.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/space2comment.py b/tamper/space2comment.py
index e6600ab6b..89f3dbca7 100644
--- a/tamper/space2comment.py
+++ b/tamper/space2comment.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/space2extrarandomblank.py b/tamper/space2extrarandomblank.py
index a91b53489..d9b08220d 100644
--- a/tamper/space2extrarandomblank.py
+++ b/tamper/space2extrarandomblank.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/space2plus.py b/tamper/space2plus.py
index d148bc266..1410c2841 100644
--- a/tamper/space2plus.py
+++ b/tamper/space2plus.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/space2pound.py b/tamper/space2pound.py
index 7f1241ec8..76b1aa988 100644
--- a/tamper/space2pound.py
+++ b/tamper/space2pound.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/space2randomblank.py b/tamper/space2randomblank.py
index cab611ded..b23a725b1 100644
--- a/tamper/space2randomblank.py
+++ b/tamper/space2randomblank.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/versionedkeywords.py b/tamper/versionedkeywords.py
index 246d7d011..2615911bb 100644
--- a/tamper/versionedkeywords.py
+++ b/tamper/versionedkeywords.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
diff --git a/tamper/versionedmorekeywords.py b/tamper/versionedmorekeywords.py
index 93c8545b2..a32a7413c 100644
--- a/tamper/versionedmorekeywords.py
+++ b/tamper/versionedmorekeywords.py
@@ -3,7 +3,7 @@
 """
 $Id$
 
-Copyright (c) 2006-2011 sqlmap developers (http://sqlmap.sourceforge.net/)
+Copyright (c) 2006-2011 sqlmap developers (http://www.sqlmap.org/)
 See the file 'doc/COPYING' for copying permission
 """
 
