diff --git a/AUTHORS b/AUTHORS
index ff3ff8e..caab95f 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,4 @@
 Davi de Castro Reis davi@users.sourceforge.net
+Djamel Belazzougui db8192@users.sourceforge.net
 Fabiano Cupertino Botelho fc_botelho@users.sourceforge.net
+Nivio Ziviani nivio@dcc.ufmg.br
diff --git a/FOOTER.t2t b/FOOTER.t2t
index d5a19e0..47698a0 100644
--- a/FOOTER.t2t
+++ b/FOOTER.t2t
@@ -7,6 +7,7 @@ Enjoy!
 
 [Djamel Belazzougui db8192@users.sourceforge.net]
 
-[Fabiano Cupertino Botelho http://www.decom.cefetmg.br/fbotelho]
+[Fabiano Cupertino Botelho fc_botelho@users.sourceforge.net]
 
+[Nivio Ziviani nivio@dcc.ufmg.br]
  
diff --git a/scpscript b/scpscript
index a4b2e54..e0c0188 100755
--- a/scpscript
+++ b/scpscript
@@ -1,3 +1,49 @@
-scp -r *.html  fc_botelho,cmph@web.sourceforge.net:htdocs/
-scp -r examples/*.c examples/keys.txt fc_botelho,cmph@web.sourceforge.net:htdocs/examples/
-scp -r papers/*.pdf fc_botelho,cmph@web.sourceforge.net:htdocs/papers/
+#!/bin/bash
+
+upload_opt=
+
+while getopts "u:" opt; do
+    case $opt in
+        u)
+            upload_opt="$OPTARG"
+        ;;
+    esac
+done
+
+function usage {
+    echo "Usage: $0 -u <upload_opt>"
+    echo "-u <upload_opt> What to upload. It can be either of the following options:"
+    echo " * html"
+    echo " * examples"
+    echo " * papers"
+    echo " * all"
+    exit 1
+}
+
+if [ "$upload_opt" = "" ] 
+then
+    usage
+fi
+
+if [ "$upload_opt" != "html" ] && 
+   [ "$upload_opt" != "examples" ] && 
+   [ "$upload_opt" != "papers" ] && 
+   [ "$upload_opt" != "all" ]
+then
+    usage
+fi
+ 
+if [ "$upload_opt" = "html" ] || [ "$upload_opt" = "all" ]
+then
+    scp -r *.html  fc_botelho@web.sourceforge.net:/home/project-web/cmph/htdocs/
+fi
+
+if [ "$upload_opt" = "examples" ] || [ "$upload_opt" = "all" ]
+then
+    scp -r examples/*.c examples/keys.txt fc_botelho@web.sourceforge.net:/home/project-web/cmph/htdocs/examples/
+fi
+
+if [ "$upload_opt" = "papers" ] || [ "$upload_opt" = "all" ]
+then
+    scp -r papers/*.pdf fc_botelho@web.sourceforge.net:/home/project-web/cmph/htdocs/papers/
+fi